Merge commit '71155d7b4157fee44c0d3d0fc1b660ebfb9ccf46'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 27 Jan 2013 12:49:57 +0000 (13:49 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 27 Jan 2013 13:24:28 +0000 (14:24 +0100)
commit91c8921d807be9a3c542967a7cb99758a16b41fe
tree2902904fce5876de769c895f768fd4b17b727fa4
parent6b2f7fd1c7285974898c31d48d477728a30199f9
parent71155d7b4157fee44c0d3d0fc1b660ebfb9ccf46
Merge commit '71155d7b4157fee44c0d3d0fc1b660ebfb9ccf46'

* commit '71155d7b4157fee44c0d3d0fc1b660ebfb9ccf46':
  dsputil: x86: Convert mpeg4 qpel and dsputil avg to yasm

Conflicts:
libavcodec/x86/dsputil_mmx.c

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