More FFmpeg bugfixing