Merge remote-tracking branch 'qatar/master'
* qatar/master: DNxHD: convert inline asm to yasm Conflicts: libavcodec/x86/Makefile libavcodec/x86/dnxhdenc.asm See: 9d34dce05ba704180916433e13add3f01b54313b Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
4899ccd295