Mercurial > libavcodec.hg
changeset 5291:d0351b81bc7c libavcodec
revert commit 9603
| author | iive |
|---|---|
| date | Wed, 11 Jul 2007 23:21:13 +0000 |
| parents | 4717b1642993 |
| children | d2a7fc14345c |
| files | Makefile avcodec.h dsputil.c dsputil.h |
| diffstat | 4 files changed, 0 insertions(+), 19 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile Wed Jul 11 23:13:30 2007 +0000 +++ b/Makefile Wed Jul 11 23:21:13 2007 +0000 @@ -13,7 +13,6 @@ jrevdct.o \ jfdctfst.o \ jfdctint.o\ - mpegidct.o \ resample.o \ resample2.o \ dsputil.o \
--- a/avcodec.h Wed Jul 11 23:13:30 2007 +0000 +++ b/avcodec.h Wed Jul 11 23:21:13 2007 +0000 @@ -1278,7 +1278,6 @@ #define FF_IDCT_CAVS 15 #define FF_IDCT_SIMPLEARMV5TE 16 #define FF_IDCT_SIMPLEARMV6 17 -#define FF_IDCT_MPEG 18 /** * slice count
--- a/dsputil.c Wed Jul 11 23:13:30 2007 +0000 +++ b/dsputil.c Wed Jul 11 23:21:13 2007 +0000 @@ -3753,17 +3753,6 @@ /* 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 @@ 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;
--- a/dsputil.h Wed Jul 11 23:13:30 2007 +0000 +++ b/dsputil.h Wed Jul 11 23:21:13 2007 +0000 @@ -47,7 +47,6 @@ 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);