[MERGE] Syncing internal ffmpeg with upstream