Merge commit '652f5185945c8405fc57aed353286858df8d066f'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 31 Oct 2012 13:02:35 +0000 (14:02 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 31 Oct 2012 13:02:35 +0000 (14:02 +0100)
commit78ec407d5a7ed8a00d49e7555e2cc55e7786fd1d
treef4bfafaf29f67c4e8224a8b2fac8a19c00a7c1f9
parent9766d9c9851577d8162d5f006dffc721902a1409
parent652f5185945c8405fc57aed353286858df8d066f
Merge commit '652f5185945c8405fc57aed353286858df8d066f'

* commit '652f5185945c8405fc57aed353286858df8d066f':
  x86: mmx2 ---> mmxext in comments and messages

Conflicts:
libswscale/x86/swscale_template.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
13 files changed:
doc/optimization.txt
libavcodec/x86/dsputil_avg_template.c
libavcodec/x86/dsputil_mmx.c
libswscale/rgb2rgb.c
libswscale/rgb2rgb_template.c
libswscale/swscale_internal.h
libswscale/utils.c
libswscale/x86/output.asm
libswscale/x86/rgb2rgb.c
libswscale/x86/rgb2rgb_template.c
libswscale/x86/swscale.c
libswscale/x86/swscale_template.c
libswscale/x86/yuv2rgb.c