rgb2rgb: allow conversion for <15 bpp

[ffmpeg] / libavcodec / jrevdct.c

diff --git a/libavcodec/jrevdct.c b/libavcodec/jrevdct.c
index f055cc1ac348ea46889eab9dfea367a6a97db6ff..5ed96da2caa8ffab3fe4b29157c3e56f9362853d 100644 (file)
--- a/libavcodec/jrevdct.c
+++ b/libavcodec/jrevdct.c
@@ -1,6 +1,4 @@
 /*
- * jrevdct.c
- *
  * This file is part of the Independent JPEG Group's software.
  *
  * The authors make NO WARRANTY or representation, either express or implied,
@@ -60,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
@@ -692,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);
@@ -717,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);