Michael Niedermayer add7513e64 Merge commit 'fa8fcab1e0d31074c0644c4ac5194474c6c26415' ...

* commit 'fa8fcab1e0d31074c0644c4ac5194474c6c26415':
  x86: h264_chromamc_10bit: drop pointless PAVG %define
  x86: mmx2 ---> mmxext in function names
  swscale: do not forget to swap data in formats with different endianness

Conflicts:
	libavcodec/x86/dsputil_mmx.c
	libavfilter/x86/gradfun.c
	libswscale/input.c
	libswscale/utils.c
	libswscale/x86/swscale.c
	tests/ref/lavfi/pixfmts_scale

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

2012-11-01 13:11:51 +01:00

..

gradfun.c

Merge commit 'fa8fcab1e0d31074c0644c4ac5194474c6c26415'

2012-11-01 13:11:51 +01:00

hqdn3d.asm

Merge commit '04581c8c77ce779e4e70684ac45302972766be0f'

2012-10-31 13:57:09 +01:00

Makefile

avfilter: call x86 init functions under if (ARCH_X86), not if (HAVE_MMX)

2012-10-12 19:58:51 +02:00

yadif_template.c

Merge commit 'ec36aa69448f20a78d8c4588265022e0b2272ab5'

2012-08-31 13:01:30 +02:00

yadif.c

Merge commit 'fa8fcab1e0d31074c0644c4ac5194474c6c26415'

2012-11-01 13:11:51 +01:00