ffmpeg: more patches