diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-01 15:38:24 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-01 16:21:52 +0200 |
| commit | f54e01c24e03a7dc340bd9449debfe7fb58987da (patch) | |
| tree | 2deebee8ec6d0cf34cbe02bce336229323df4b42 /libavcodec/x86/dct-test.c | |
| parent | ad99837b638f1271da37dbe75d409b1350ad556e (diff) | |
| parent | a786c8259dafeca9744252230b5d78f67810770c (diff) | |
| download | ffmpeg-f54e01c24e03a7dc340bd9449debfe7fb58987da.tar.gz | |
Merge commit 'a786c8259dafeca9744252230b5d78f67810770c'
* commit 'a786c8259dafeca9744252230b5d78f67810770c':
idct: Split off Xvid IDCT
Conflicts:
libavcodec/Makefile
libavcodec/mpeg4videodec.c
libavcodec/x86/Makefile
libavcodec/x86/idctdsp_init.c
This split is somewhat restructured leaving the xvid IDCT available
outside mpeg4 if manually selected.
The code also could not be merged unchanged as it conflicted with a
bugfix in FFmpeg
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/x86/dct-test.c')
| -rw-r--r-- | libavcodec/x86/dct-test.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/x86/dct-test.c b/libavcodec/x86/dct-test.c index 85d643aa63..3ade1f3ce4 100644 --- a/libavcodec/x86/dct-test.c +++ b/libavcodec/x86/dct-test.c @@ -59,6 +59,9 @@ static const struct algo fdct_tab_arch[] = { static const struct algo idct_tab_arch[] = { #if HAVE_MMX_INLINE { "SIMPLE-MMX", ff_simple_idct_mmx, FF_IDCT_PERM_SIMPLE, AV_CPU_FLAG_MMX }, +#endif +#if CONFIG_MPEG4_DECODER +#if HAVE_MMX_INLINE { "XVID-MMX", ff_idct_xvid_mmx, FF_IDCT_PERM_NONE, AV_CPU_FLAG_MMX, 1 }, #endif #if HAVE_MMXEXT_INLINE @@ -70,6 +73,7 @@ static const struct algo idct_tab_arch[] = { { "PR-SSE2", ff_prores_idct_put_10_sse2_wrap, FF_IDCT_PERM_TRANSPOSE, AV_CPU_FLAG_SSE2, 1 }, #endif #endif +#endif /* CONFIG_MPEG4_DECODER */ { 0 } }; |