[FFmpeg-cvslog] wma: Kill non-compiling disabled cruft

[Diego Biurrun]

ffmpeg | branch: master | Diego Biurrun <diego at biurrun.de> | Tue Aug  2 12:01:12 2016 +0200| [a972fc1c0ab6e7f169f9145d6da46e8cedbc291c] | committer: Diego Biurrun

wma: Kill non-compiling disabled cruft

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a972fc1c0ab6e7f169f9145d6da46e8cedbc291c
---

 libavcodec/wma.c    | 10 ----------
 libavcodec/wmaenc.c | 17 -----------------
 2 files changed, 27 deletions(-)

diff --git a/libavcodec/wma.c b/libavcodec/wma.c
index 85193ff..4067dff 100644
--- a/libavcodec/wma.c
+++ b/libavcodec/wma.c
@@ -276,16 +276,6 @@ av_cold int ff_wma_init(AVCodecContext *avctx, int flags2)
                     s->exponent_high_bands[k][j++] = end - start;
             }
             s->exponent_high_sizes[k] = j;
-#if 0
-            ff_tlog(s->avctx, "%5d: coefs_end=%d high_band_start=%d nb_high_bands=%d: ",
-                    s->frame_len >> k,
-                    s->coefs_end[k],
-                    s->high_band_start[k],
-                    s->exponent_high_sizes[k]);
-            for (j = 0; j < s->exponent_high_sizes[k]; j++)
-                ff_tlog(s->avctx, " %d", s->exponent_high_bands[k][j]);
-            ff_tlog(s->avctx, "\n");
-#endif /* 0 */
         }
     }
 
diff --git a/libavcodec/wmaenc.c b/libavcodec/wmaenc.c
index e991bb8..800c000 100644
--- a/libavcodec/wmaenc.c
+++ b/libavcodec/wmaenc.c
@@ -386,7 +386,6 @@ static int encode_superframe(AVCodecContext *avctx, AVPacket *avpkt,
         return ret;
     }
 
-#if 1
     total_gain = 128;
     for (i = 64; i; i >>= 1) {
         int error = encode_frame(s, s->coefs, avpkt->data, avpkt->size,
@@ -394,22 +393,6 @@ static int encode_superframe(AVCodecContext *avctx, AVPacket *avpkt,
         if (error < 0)
             total_gain -= i;
     }
-#else
-    total_gain = 90;
-    best = encode_frame(s, s->coefs, avpkt->data, avpkt->size, total_gain);
-    for (i = 32; i; i >>= 1) {
-        int scoreL = encode_frame(s, s->coefs, avpkt->data, avpkt->size, total_gain - i);
-        int scoreR = encode_frame(s, s->coefs, avpkt->data, avpkt->size, total_gain + i);
-        av_log(NULL, AV_LOG_ERROR, "%d %d %d (%d)\n", scoreL, best, scoreR, total_gain);
-        if (scoreL < FFMIN(best, scoreR)) {
-            best        = scoreL;
-            total_gain -= i;
-        } else if (scoreR < best) {
-            best        = scoreR;
-            total_gain += i;
-        }
-    }
-#endif /* 1 */
 
     if ((i = encode_frame(s, s->coefs, avpkt->data, avpkt->size, total_gain)) >= 0) {
         av_log(avctx, AV_LOG_ERROR, "required frame size too large. please "