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)
* 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>
1  2 
libavcodec/x86/dsputil.asm
libavcodec/x86/h264_qpel_8bit.asm

Simple merge
Simple merge