Merge commit '34c22a9ca656603428b2c3490d1339c5a5966961'

[ffmpeg] / libavcodec / faandct.c

diff --git a/libavcodec/faandct.c b/libavcodec/faandct.c
index b6830725d2184e1d4a73b7452acd47ca23b458c8..38c392bbae0ceb9e0d93557e4496d9d4e9a6ce1f 100644 (file)
--- a/libavcodec/faandct.c
+++ b/libavcodec/faandct.c
@@ -96,17 +96,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;
@@ -158,17 +150,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;