[FFmpeg-cvslog] Merge commit 'fa8fcab1e0d31074c0644c4ac5194474c6c26415'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Nov  1 12:53:19 2012 +0100| [add7513e64e6db255e30fba544068ed2ab5e7b3e] | committer: Michael Niedermayer

Merge commit 'fa8fcab1e0d31074c0644c4ac5194474c6c26415'

* commit 'fa8fcab1e0d31074c0644c4ac5194474c6c26415':
  x86: h264_chromamc_10bit: drop pointless PAVG %define
  x86: mmx2 ---> mmxext in function names
  swscale: do not forget to swap data in formats with different endianness

Conflicts:
	libavcodec/x86/dsputil_mmx.c
	libavfilter/x86/gradfun.c
	libswscale/input.c
	libswscale/utils.c
	libswscale/x86/swscale.c
	tests/ref/lavfi/pixfmts_scale

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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