Updated to ffmpeg 2.2.1