Merge commit 'a65bdceb060628881578afb29df4eb222421381f'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 31 Oct 2012 13:08:49 +0000 (14:08 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 31 Oct 2012 13:08:49 +0000 (14:08 +0100)
commit4b874fc4fc2739db7a907ce430ac862e625b7387
treef3e116c3be4782c51b3843daa06dcb754e24ce27
parent78ec407d5a7ed8a00d49e7555e2cc55e7786fd1d
parenta65bdceb060628881578afb29df4eb222421381f
Merge commit 'a65bdceb060628881578afb29df4eb222421381f'

* commit 'a65bdceb060628881578afb29df4eb222421381f':
  x86: mmx2 ---> mmxext in variable names

Conflicts:
libswscale/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libswscale/swscale_internal.h
libswscale/utils.c
libswscale/x86/swscale_template.c