aacenc: cosmetics: move init() and end() to the bottom of the file.

[ffmpeg] / libavcodec / jrevdct.c

diff --git a/libavcodec/jrevdct.c b/libavcodec/jrevdct.c
index dc2ffaff71c4731fdb003a8a9b6f7111b80b5c6d..5ed96da2caa8ffab3fe4b29157c3e56f9362853d 100644 (file)
--- a/libavcodec/jrevdct.c
+++ b/libavcodec/jrevdct.c
@@ -1,9 +1,40 @@
 /*
- * jrevdct.c
- *
- * Copyright (C) 1991, 1992, Thomas G. Lane.
  * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
+ *
+ * The authors make NO WARRANTY or representation, either express or implied,
+ * with respect to this software, its quality, accuracy, merchantability, or
+ * fitness for a particular purpose.  This software is provided "AS IS", and
+ * you, its user, assume the entire risk as to its quality and accuracy.
+ *
+ * This software is copyright (C) 1991, 1992, Thomas G. Lane.
+ * All Rights Reserved except as specified below.
+ *
+ * Permission is hereby granted to use, copy, modify, and distribute this
+ * software (or portions thereof) for any purpose, without fee, subject to
+ * these conditions:
+ * (1) If any part of the source code for this software is distributed, then
+ * this README file must be included, with this copyright and no-warranty
+ * notice unaltered; and any additions, deletions, or changes to the original
+ * files must be clearly indicated in accompanying documentation.
+ * (2) If only executable code is distributed, then the accompanying
+ * documentation must state that "this software is based in part on the work
+ * of the Independent JPEG Group".
+ * (3) Permission for use of this software is granted only if the user accepts
+ * full responsibility for any undesirable consequences; the authors accept
+ * NO LIABILITY for damages of any kind.
+ *
+ * These conditions apply to any software derived from or based on the IJG
+ * code, not just to the unmodified library.  If you use our work, you ought
+ * to acknowledge us.
+ *
+ * Permission is NOT granted for the use of any IJG author's name or company
+ * name in advertising or publicity relating to this software or products
+ * derived from it.  This software may be referred to only as "the Independent
+ * JPEG Group's software".
+ *
+ * We specifically permit and encourage the use of this software as the basis
+ * of commercial products, provided that all warranty or liability claims are
+ * assumed by the product vendor.
  *
  * This file contains the basic inverse-DCT transformation subroutine.
  *
@@ -27,11 +58,11 @@
  */
 
 /**
- * @file jrevdct.c
+ * @file
  * Independent JPEG Group's LLM idct.
  */
 
-#include "common.h"
+#include "libavutil/common.h"
 #include "dsputil.h"
 
 #define EIGHT_BIT_SAMPLES
@@ -659,7 +690,6 @@ void j_rev_dct(DCTBLOCK data)
                     tmp3 += z1 + z4;
                 } else {
                     /* d1 == 0, d3 != 0, d5 != 0, d7 != 0 */
-                    z1 = d7;
                     z2 = d5 + d3;
                     z3 = d7 + d3;
                     z5 = MULTIPLY(z3 + d5, FIX_1_175875602);
@@ -684,7 +714,6 @@ void j_rev_dct(DCTBLOCK data)
                 if (d1) {
                     /* d1 != 0, d3 == 0, d5 != 0, d7 != 0 */
                     z1 = d7 + d1;
-                    z2 = d5;
                     z3 = d7;
                     z4 = d5 + d1;
                     z5 = MULTIPLY(z3 + z4, FIX_1_175875602);