[FFmpeg-cvslog] Merge commit '9ce02e14f01de50fcc6f7f459544b140be66d615'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Nov  3 13:38:38 2012 +0100| [1dad4867146007486d6e84e59454734d1fc804c5] | committer: Michael Niedermayer

Merge commit '9ce02e14f01de50fcc6f7f459544b140be66d615'

* commit '9ce02e14f01de50fcc6f7f459544b140be66d615':
  x86: ac3dsp: port to cpuflags
  x86util: Add cpuflags_mmxext alias for cpuflags_mmx2
  x86inc: Only define program_name if the macro is unset

Conflicts:
	libavcodec/x86/ac3dsp.asm

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

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