Update for ffmpeg 2.2.3