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)
commit66c3bac2b9def1c144a54a725a35ff11d1aadd2e
treede5e2f6af5a710d5f28730e8c41980bfa67a13ec
parentbf2f93cdbf15c96c62b5112c1ab7f8093177e508
parentad01ba6ceaea7d71c4b9887795523438689b5a96
Merge commit 'ad01ba6ceaea7d71c4b9887795523438689b5a96'

* commit 'ad01ba6ceaea7d71c4b9887795523438689b5a96':
  x86: h264: Remove 3dnow QPEL code

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