Merge commit '9ce02e14f01de50fcc6f7f459544b140be66d615'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 3 Nov 2012 12:38:38 +0000 (13:38 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 3 Nov 2012 12:38:38 +0000 (13:38 +0100)
commit1dad4867146007486d6e84e59454734d1fc804c5
tree84d90dde2ff8ec5c8bec330aab43f05dd5025ade
parent1c755f76676eeaebbeb8763390c679a9b735c334
parent9ce02e14f01de50fcc6f7f459544b140be66d615
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@gmx.at>
libavcodec/x86/ac3dsp.asm
libavutil/x86/x86inc.asm
libavutil/x86/x86util.asm