faan(i)dct: Kill some disabled code

diff --git a/libavcodec/faandct.c b/libavcodec/faandct.c
index 4053d69db1eb175e9cdaa39595b5a54a085ef91f..7888633d7cc5139a37ba575bd20f6158a72f9703 100644 (file)
--- a/libavcodec/faandct.c
+++ b/libavcodec/faandct.c
@@ -97,17 +97,9 @@ static av_always_inline void row_fdct(FLOAT temp[64], int16_t *data)
         tmp5 += tmp6;
         tmp6 += tmp7;
 
-#if 0
-        {
-            FLOAT z5;
-            z5 = (tmp4 - tmp6) * A5;
-            z2 =  tmp4         * A2 + z5;
-            z4 =  tmp6         * A4 + z5;
-        }
-#else
         z2= tmp4*(A2+A5) - tmp6*A5;
         z4= tmp6*(A4-A5) + tmp4*A5;
-#endif
+
         tmp5*=A1;
 
         z11= tmp7 + tmp5;
@@ -159,17 +151,9 @@ void ff_faandct(int16_t *data)
         tmp5 += tmp6;
         tmp6 += tmp7;
 
-#if 0
-        {
-            FLOAT z5;
-            z5 = (tmp4 - tmp6) * A5;
-            z2 =  tmp4         * A2 + z5;
-            z4 =  tmp6         * A4 + z5;
-        }
-#else
         z2= tmp4*(A2+A5) - tmp6*A5;
         z4= tmp6*(A4-A5) + tmp4*A5;
-#endif
+
         tmp5*=A1;
 
         z11= tmp7 + tmp5;

diff --git a/libavcodec/faanidct.c b/libavcodec/faanidct.c
index 2e9ce9ce1e2492749c5ec312a606f9e5f2c09531..b132f89d4d3b4961874c319b916804f01e478006 100644 (file)
--- a/libavcodec/faanidct.c
+++ b/libavcodec/faanidct.c
@@ -62,17 +62,8 @@ static inline void p8idct(int16_t data[64], FLOAT temp[64], uint8_t *dest, int s
         od07=  s17 + s53;
         od25= (s17 - s53)*(2*A4);
 
-#if 0 //these 2 are equivalent
-        {
-            FLOAT tmp0;
-            tmp0 = (d17 + d53) *  (2 * A2);
-            od34 =  d17        *  (2 * B6) - tmp0;
-            od16 =  d53        * (-2 * B2) + tmp0;
-        }
-#else
         od34=  d17*(2*(B6-A2)) - d53*(2*A2);
         od16=  d53*(2*(A2-B2)) + d17*(2*A2);
-#endif
 
         od16 -= od07;
         od25 -= od16;