I've rebased the patch against current master, it is a lot of FATE changes due to the extra 4 bytes... It should now merge appropriately, see https://github.com/FFmpeg/FFmpeg/pull/110 Please let me know if anything needs tweaking Thanks Kevin