# HG changeset patch
# User iive
# Date 1184196073 0
# Node ID d0351b81bc7c579d4b6ce55a86737ca46b9c1017
# Parent  4717b164299396237ef55ce86b5b3e945226c24e
revert commit 9603

diff -r 4717b1642993 -r d0351b81bc7c Makefile
--- 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 \
diff -r 4717b1642993 -r d0351b81bc7c avcodec.h
--- 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
diff -r 4717b1642993 -r d0351b81bc7c dsputil.c
--- 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;
diff -r 4717b1642993 -r d0351b81bc7c dsputil.h
--- 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);