aacenc: aac_encode_init() cleanup

[ffmpeg] / libavcodec / faanidct.c

diff --git a/libavcodec/faanidct.c b/libavcodec/faanidct.c
index 75c09cda86e39cef68be4bc99edaecd4257dc1b2..0b9b458284d006449818313312d00399fbac1b43 100644 (file)
--- a/libavcodec/faanidct.c
+++ b/libavcodec/faanidct.c
@@ -2,24 +2,25 @@
  * Floating point AAN IDCT
  * Copyright (c) 2008 Michael Niedermayer <michaelni@gmx.at>
  *
- * This file is part of FFmpeg.
+ * This file is part of Libav.
  *
- * FFmpeg is free software; you can redistribute it and/or
+ * Libav is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
  *
- * FFmpeg is distributed in the hope that it will be useful,
+ * Libav is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
+ * License along with Libav; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
-#include "mpegvideo.h"
+#include "faanidct.h"
 
+/* To allow switching to double. */
 #define FLOAT float
 
 #define B0 1.0000000000000000000000
@@ -47,7 +48,7 @@ B7*B0/8, B7*B1/8, B7*B2/8, B7*B3/8, B7*B4/8, B7*B5/8, B7*B6/8, B7*B7/8,
 
 static inline void p8idct(DCTELEM data[64], FLOAT temp[64], uint8_t *dest, int stride, int x, int y, int type){
     int i;
-    FLOAT tmp0, tmp1;
+    FLOAT av_unused tmp0;
     FLOAT s04, d04, s17, d17, s26, d26, s53, d53;
     FLOAT os07, os16, os25, os34;
     FLOAT od07, od16, od25, od34;
@@ -76,15 +77,16 @@ static inline void p8idct(DCTELEM data[64], FLOAT temp[64], uint8_t *dest, int s
 
         s26 = temp[2*x + i] + temp[6*x + i];
         d26 = temp[2*x + i] - temp[6*x + i];
-        tmp1= d26*(2*A4) - s26;
+        d26*= 2*A4;
+        d26-= s26;
 
         s04= temp[0*x + i] + temp[4*x + i];
         d04= temp[0*x + i] - temp[4*x + i];
 
         os07= s04 + s26;
         os34= s04 - s26;
-        os16= d04 + tmp1;
-        os25= d04 - tmp1;
+        os16= d04 + d26;
+        os25= d04 - d26;
 
         if(type==0){
             temp[0*x + i]= os07 + od07;