diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-27 21:09:30 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-27 21:09:30 +0200 |
| commit | b3b05a11d31d544025c0400a1c6bc70124300a86 (patch) | |
| tree | 66dd99b2b70d25bcb2319225f6a710710f29205f /libavcodec/x86/dct-test.c | |
| parent | 3ff5ca89fc8783cabed56887f556bdd83279ffb0 (diff) | |
| parent | dcb7c868ec7af7d3a138b3254ef2e08f074d8ec5 (diff) | |
| download | ffmpeg-b3b05a11d31d544025c0400a1c6bc70124300a86.tar.gz | |
Merge commit 'dcb7c868ec7af7d3a138b3254ef2e08f074d8ec5'
* commit 'dcb7c868ec7af7d3a138b3254ef2e08f074d8ec5':
cosmetics: Make naming scheme of Xvid IDCT consistent with other IDCTs
Conflicts:
libavcodec/mpeg4videodec.c
libavcodec/x86/Makefile
libavcodec/x86/dct-test.c
libavcodec/x86/xvididct_sse2.c
libavcodec/xvididct.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/x86/dct-test.c')
| -rw-r--r-- | libavcodec/x86/dct-test.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/x86/dct-test.c b/libavcodec/x86/dct-test.c index 3ade1f3ce4..3414cb0cb0 100644 --- a/libavcodec/x86/dct-test.c +++ b/libavcodec/x86/dct-test.c @@ -19,7 +19,7 @@ #include "config.h" #include "fdct.h" -#include "idct_xvid.h" +#include "xvididct.h" #include "simple_idct.h" #if ARCH_X86_64 && HAVE_MMX && HAVE_YASM @@ -62,13 +62,13 @@ static const struct algo idct_tab_arch[] = { #endif #if CONFIG_MPEG4_DECODER #if HAVE_MMX_INLINE - { "XVID-MMX", ff_idct_xvid_mmx, FF_IDCT_PERM_NONE, AV_CPU_FLAG_MMX, 1 }, + { "XVID-MMX", ff_xvid_idct_mmx, FF_IDCT_PERM_NONE, AV_CPU_FLAG_MMX, 1 }, #endif #if HAVE_MMXEXT_INLINE - { "XVID-MMXEXT", ff_idct_xvid_mmxext, FF_IDCT_PERM_NONE, AV_CPU_FLAG_MMXEXT, 1 }, + { "XVID-MMXEXT", ff_xvid_idct_mmxext, FF_IDCT_PERM_NONE, AV_CPU_FLAG_MMXEXT, 1 }, #endif #if HAVE_SSE2_INLINE - { "XVID-SSE2", ff_idct_xvid_sse2, FF_IDCT_PERM_SSE2, AV_CPU_FLAG_SSE2, 1 }, + { "XVID-SSE2", ff_xvid_idct_sse2, FF_IDCT_PERM_SSE2, AV_CPU_FLAG_SSE2, 1 }, #if ARCH_X86_64 && HAVE_YASM { "PR-SSE2", ff_prores_idct_put_10_sse2_wrap, FF_IDCT_PERM_TRANSPOSE, AV_CPU_FLAG_SSE2, 1 }, #endif |