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/xvididct_init.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/xvididct_init.c')
| -rw-r--r-- | libavcodec/x86/xvididct_init.c | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/libavcodec/x86/xvididct_init.c b/libavcodec/x86/xvididct_init.c index c9838e3224..be0f700766 100644 --- a/libavcodec/x86/xvididct_init.c +++ b/libavcodec/x86/xvididct_init.c @@ -22,31 +22,32 @@ #include "libavutil/x86/cpu.h" #include "libavcodec/idctdsp.h" #include "libavcodec/xvididct.h" -#include "idct_xvid.h" + #include "idctdsp.h" +#include "xvididct.h" -av_cold void ff_xvididct_init_x86(IDCTDSPContext *c) +av_cold void ff_xvid_idct_init_x86(IDCTDSPContext *c) { int cpu_flags = av_get_cpu_flags(); if (INLINE_MMX(cpu_flags)) { - c->idct_put = ff_idct_xvid_mmx_put; - c->idct_add = ff_idct_xvid_mmx_add; - c->idct = ff_idct_xvid_mmx; + c->idct_put = ff_xvid_idct_mmx_put; + c->idct_add = ff_xvid_idct_mmx_add; + c->idct = ff_xvid_idct_mmx; c->perm_type = FF_IDCT_PERM_NONE; } if (INLINE_MMXEXT(cpu_flags)) { - c->idct_put = ff_idct_xvid_mmxext_put; - c->idct_add = ff_idct_xvid_mmxext_add; - c->idct = ff_idct_xvid_mmxext; + c->idct_put = ff_xvid_idct_mmxext_put; + c->idct_add = ff_xvid_idct_mmxext_add; + c->idct = ff_xvid_idct_mmxext; c->perm_type = FF_IDCT_PERM_NONE; } if (INLINE_SSE2(cpu_flags)) { - c->idct_put = ff_idct_xvid_sse2_put; - c->idct_add = ff_idct_xvid_sse2_add; - c->idct = ff_idct_xvid_sse2; + c->idct_put = ff_xvid_idct_sse2_put; + c->idct_add = ff_xvid_idct_sse2_add; + c->idct = ff_xvid_idct_sse2; c->perm_type = FF_IDCT_PERM_SSE2; } } |