Merge commit 'ad01ba6ceaea7d71c4b9887795523438689b5a96'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 25 Nov 2012 23:57:12 +0000 (00:57 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 25 Nov 2012 23:57:33 +0000 (00:57 +0100)
* commit 'ad01ba6ceaea7d71c4b9887795523438689b5a96':
  x86: h264: Remove 3dnow QPEL code

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/x86/dsputil_avg_template.c
libavcodec/x86/dsputil_mmx.c
libavcodec/x86/h264_qpel.c

Simple merge
Simple merge
Simple merge