Update for FFmpeg 2.3.3