diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-13 02:56:33 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-13 02:56:33 +0100 |
| commit | 1f27053b91e4f0b1f6571448db9e363fd84e65b6 (patch) | |
| tree | 80a21139597213277feb0fa99a3006d4a1b800dd /libavcodec/dct-test.c | |
| parent | d3edc65dd1e5b5d4246fcb8bcd216eb558bab7d4 (diff) | |
| parent | de27d2b92fa97deb2856d18e9f5f19586ce45a0f (diff) | |
| download | ffmpeg-1f27053b91e4f0b1f6571448db9e363fd84e65b6.tar.gz | |
Merge commit 'de27d2b92fa97deb2856d18e9f5f19586ce45a0f'
* commit 'de27d2b92fa97deb2856d18e9f5f19586ce45a0f':
lavc: remove disabled FF_API_LIBMPEG2 cruft
Conflicts:
libavcodec/avcodec.h
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dct-test.c')
| -rw-r--r-- | libavcodec/dct-test.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/libavcodec/dct-test.c b/libavcodec/dct-test.c index 29f47e8b76..364733693b 100644 --- a/libavcodec/dct-test.c +++ b/libavcodec/dct-test.c @@ -49,9 +49,6 @@ #undef printf -void ff_mmx_idct(int16_t *data); -void ff_mmxext_idct(int16_t *data); - // BFIN void ff_bfin_idct(int16_t *block); void ff_bfin_fdct(int16_t *block); @@ -126,10 +123,6 @@ static const struct algo idct_tab[] = { { "SIMPLE-C", ff_simple_idct_8, NO_PERM }, #if HAVE_MMX_INLINE -#if CONFIG_GPL - { "LIBMPEG2-MMX", ff_mmx_idct, MMX_PERM, AV_CPU_FLAG_MMX, 1 }, - { "LIBMPEG2-MMX2", ff_mmxext_idct, MMX_PERM, AV_CPU_FLAG_MMX2, 1 }, -#endif { "SIMPLE-MMX", ff_simple_idct_mmx, MMX_SIMPLE_PERM, AV_CPU_FLAG_MMX }, { "XVID-MMX", ff_idct_xvid_mmx, NO_PERM, AV_CPU_FLAG_MMX, 1 }, { "XVID-MMXEXT", ff_idct_xvid_mmxext, NO_PERM, AV_CPU_FLAG_MMXEXT, 1 }, |