Minor changes for FFmpeg 2.0