Merge commit 'e8c52271c45ec27d783e74238dcfad0c2008731c'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 1 Mar 2013 12:39:47 +0000 (13:39 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 1 Mar 2013 12:39:47 +0000 (13:39 +0100)
commit1a7166a58d697ac43eda546f4ccbddeb0e078196
treeb7a72958cbb750b97c26eaf0209868a4391cbae2
parent28bb17ca362286c92384e466d0c47f702f5d2e3d
parente8c52271c45ec27d783e74238dcfad0c2008731c
Merge commit 'e8c52271c45ec27d783e74238dcfad0c2008731c'

* commit 'e8c52271c45ec27d783e74238dcfad0c2008731c':
  Revert "Move H264/QPEL specific asm from dsputil.asm to h264_qpel_*.asm."

Conflicts:
libavcodec/x86/dsputil.asm

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/x86/dsputil.asm
libavcodec/x86/h264_qpel_8bit.asm