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)
commite6d81ce22e433e5413003e49b39587d739a04520
tree9f5cf3e72a7aa2bc13f80da8695fd6d8a6c161cb
parent4116151a4bf35cffd2b55b028e714bb2c383c86f
parent89923fce7006d0a42859360068c486aeb7e9b582
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  x86: h264_intrapred: Fix C function names in comments
  x86: SPLATD: port to cpuflags

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