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