[ffmpeg] Patch1 merged upstream