[FFmpeg-cvslog] Merge commit 'be923ed659016350592acb9b3346f706f8170ac5'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Oct 31 14:16:04 2012 +0100| [28c0678eb764b8d10faf1a988d2f0e2dc79c96a5] | committer: Michael Niedermayer

Merge commit 'be923ed659016350592acb9b3346f706f8170ac5'

* commit 'be923ed659016350592acb9b3346f706f8170ac5':
  x86: fmtconvert: port to cpuflags
  x86: MMX2 ---> MMXEXT in macro names

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

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