diff options
| author | Ivan Kalvachev <ikalvachev@gmail.com> | 2007-07-11 23:21:13 +0000 |
|---|---|---|
| committer | Ivan Kalvachev <ikalvachev@gmail.com> | 2007-07-11 23:21:13 +0000 |
| commit | 0ac9a875d4446c84ef99249e61b7ba8cf67d5861 (patch) | |
| tree | c4ca3b378d042bb7a651297863c1ddf7e9af6ac9 | |
| parent | 58f46f2f27526356cf7c1698e0034aa11c13e270 (diff) | |
| download | ffmpeg-0ac9a875d4446c84ef99249e61b7ba8cf67d5861.tar.gz | |
revert commit 9603
Originally committed as revision 9605 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/Makefile | 1 | ||||
| -rw-r--r-- | libavcodec/avcodec.h | 1 | ||||
| -rw-r--r-- | libavcodec/dsputil.c | 16 | ||||
| -rw-r--r-- | libavcodec/dsputil.h | 1 |
4 files changed, 0 insertions, 19 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index f2ffc37a37..33c3c22672 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -13,7 +13,6 @@ OBJS= bitstream.o \ jrevdct.o \ jfdctfst.o \ jfdctint.o\ - mpegidct.o \ resample.o \ resample2.o \ dsputil.o \ diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 819f71fee6..c90b2cdc44 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -1278,7 +1278,6 @@ typedef struct AVCodecContext { #define FF_IDCT_CAVS 15 #define FF_IDCT_SIMPLEARMV5TE 16 #define FF_IDCT_SIMPLEARMV6 17 -#define FF_IDCT_MPEG 18 /** * slice count diff --git a/libavcodec/dsputil.c b/libavcodec/dsputil.c index ec0fc1abbd..41fef24df1 100644 --- a/libavcodec/dsputil.c +++ b/libavcodec/dsputil.c @@ -3753,17 +3753,6 @@ void ff_float_to_int16_c(int16_t *dst, const float *src, int len){ /* XXX: those functions should be suppressed ASAP when all IDCTs are converted */ -static void ff_mpeg_idct_put_c(uint8_t *dest, int line_size, DCTELEM *block) -{ - ff_mpeg_idct_c(block); - put_pixels_clamped_c(block, dest, line_size); -} -static void ff_mpeg_idct_add_c(uint8_t *dest, int line_size, DCTELEM *block) -{ - ff_mpeg_idct_c(block); - add_pixels_clamped_c(block, dest, line_size); -} - static void ff_jref_idct_put(uint8_t *dest, int line_size, DCTELEM *block) { j_rev_dct (block); @@ -3902,11 +3891,6 @@ void dsputil_init(DSPContext* c, AVCodecContext *avctx) c->idct_add= ff_vp3_idct_add_c; c->idct = ff_vp3_idct_c; c->idct_permutation_type= FF_NO_IDCT_PERM; - }else if(avctx->idct_algo==FF_IDCT_MPEG){ - c->idct_put= ff_mpeg_idct_put_c; - c->idct_add= ff_mpeg_idct_add_c; - c->idct = ff_mpeg_idct_c; - c->idct_permutation_type= FF_NO_IDCT_PERM; }else{ //accurate/default c->idct_put= simple_idct_put; c->idct_add= simple_idct_add; diff --git a/libavcodec/dsputil.h b/libavcodec/dsputil.h index 80bcd62dc9..2d312e5196 100644 --- a/libavcodec/dsputil.h +++ b/libavcodec/dsputil.h @@ -47,7 +47,6 @@ void j_rev_dct (DCTELEM *data); void j_rev_dct4 (DCTELEM *data); void j_rev_dct2 (DCTELEM *data); void j_rev_dct1 (DCTELEM *data); -void ff_mpeg_idct_c(DCTELEM *data); void ff_fdct_mmx(DCTELEM *block); void ff_fdct_mmx2(DCTELEM *block); |