Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 19 Nov 2012 13:24:10 +0000 (14:24 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 19 Nov 2012 13:24:20 +0000 (14:24 +0100)
* qatar/master:
  x86: h264_intrapred: Fix C function names in comments
  x86: SPLATD: port to cpuflags

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

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge