[ffmpeg] Backport upstream patch