Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 10 Nov 2012 11:44:27 +0000 (12:44 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 10 Nov 2012 11:44:39 +0000 (12:44 +0100)
* qatar/master:
  x86: PALIGNR: port to cpuflags
  x86: h264_qpel_10bit: port to cpuflags

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/x86/h264_intrapred.asm
libavutil/x86/x86util.asm
libswscale/x86/output.asm

Simple merge
Simple merge
Simple merge