[upstream] Update to ffmpeg-2.2.4.