Merge remote-tracking branch 'qatar/master'

Browse Source

* 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:

Michael Niedermayer 2014-04-11 14:41:42 +02:00

parent ee2a43798c 71c32ed533

commit 4899ccd295

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available