Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 11 Apr 2014 12:41:42 +0000 (14:41 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 11 Apr 2014 12:42:02 +0000 (14:42 +0200)
* 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>

Trivial merge