* 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> |
12 years ago | |
---|---|---|
.. | ||
Makefile | avfilter: call x86 init functions under if (ARCH_X86), not if (HAVE_MMX) | 12 years ago |
gradfun.c | Merge commit 'fa8fcab1e0d31074c0644c4ac5194474c6c26415' | 12 years ago |
hqdn3d.asm | Merge commit '04581c8c77ce779e4e70684ac45302972766be0f' | 12 years ago |
yadif.c | Merge commit 'fa8fcab1e0d31074c0644c4ac5194474c6c26415' | 12 years ago |
yadif_template.c | Merge commit 'ec36aa69448f20a78d8c4588265022e0b2272ab5' | 12 years ago |