[transcode/f27] (2 commits) ...Use single patch for ffmpeg