Merge commit '845cfc92f908791714b8c4c8a49c91b8c64b685e'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 27 Feb 2013 11:22:10 +0000 (12:22 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 27 Feb 2013 11:22:10 +0000 (12:22 +0100)
commitcdb9752a0f96373e80bcee71d19515c6c5605f23
tree98dba03c8082d746e638657ecdd943b03c97da21
parent04ec796bda7919058d6a75cf11b9a387a207375a
parent845cfc92f908791714b8c4c8a49c91b8c64b685e
Merge commit '845cfc92f908791714b8c4c8a49c91b8c64b685e'

* commit '845cfc92f908791714b8c4c8a49c91b8c64b685e':
  x86: dsputil: Drop aliasing of ff_put_pixels8_mmx to ff_put_pixels8_mmxext

Conflicts:
libavcodec/x86/dsputil_mmx.c

Note, the commit message is wrong, there are no mmxext instructions as
claimed in the function. The change should do no harm though

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