Updated to use ffmpeg-2.1