[ffmpeg/f25] (2 commits) ...drop patch, fixed upstream