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)
commit2ce64413e2b7f60041ff3e929e58242004c7921d
tree3c79e169c5da7940c94eb61658a6e69e3f221795
parentb56ff0b261c4432e52e6b66bbd515f5694292b8a
parent4b60fac4199680957b15b7a08c5df47e47c6e25e
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  x86: PALIGNR: port to cpuflags
  x86: h264_qpel_10bit: port to cpuflags

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