[upstream] Update to ffmpeg-2.4.2.