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

Conflicts:
	libswscale/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>