Updated for FFmpeg 2.2.3