[FFmpeg-cvslog] Merge commit '845cfc92f908791714b8c4c8a49c91b8c64b685e'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Feb 27 12:22:10 2013 +0100| [cdb9752a0f96373e80bcee71d19515c6c5605f23] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cdb9752a0f96373e80bcee71d19515c6c5605f23
---