More FFmpeg patches