Changes for FFmpeg 2.1