Changed for latest ffmpeg support