Updated for ffmpeg-1.1