Ticket #4343: atrac3plus.c-num_quant_units-compilation-warning.patch

libavcodec/atrac3plus.c

@@ -1768 +1768 @@
 
     /* parse sound header */
     ctx->num_quant_units = get_bits(gb, 5) + 1;
-    if (ctx->num_quant_units > 28 && ctx->num_quant_units < 32) {
+    if (!(ctx->num_quant_units > 28 && ctx->num_quant_units < 32)) {
         av_log(avctx, AV_LOG_ERROR,
                "Invalid number of quantization units: %d!\n",
                ctx->num_quant_units);
@@ -1778 +1778 @@
     ctx->mute_flag = get_bits1(gb);
 
     /* decode various sound parameters */
+    ctx->num_subbands       = atrac3p_qu_to_subband[ctx->num_quant_units - 1] + 1;
+
     if ((ret = decode_quant_wordlen(gb, ctx, num_channels, avctx)) < 0)
         return ret;
 
-    ctx->num_subbands       = atrac3p_qu_to_subband[ctx->num_quant_units - 1] + 1;
     ctx->num_coded_subbands = ctx->used_quant_units
                               ? atrac3p_qu_to_subband[ctx->used_quant_units - 1] + 1
                               : 0;