Merge commit 'c49cbecbae5a42f4ca004197b0118cc50aaaca2e'
authorHendrik Leppkes <h.leppkes@gmail.com>
Tue, 29 Sep 2015 13:36:06 +0000 (15:36 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Tue, 29 Sep 2015 13:36:06 +0000 (15:36 +0200)
* commit 'c49cbecbae5a42f4ca004197b0118cc50aaaca2e':
  dnxhddec: Decode and use interlace mb flag

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
libavcodec/dnxhddec.c

index 423bce2..e3dec78 100644 (file)
@@ -401,8 +401,9 @@ static int dnxhd_decode_macroblock(const DNXHDContext *ctx, RowContext *row,
     if (ctx->mbaff) {
         interlaced_mb = get_bits1(&row->gb);
         qscale = get_bits(&row->gb, 10);
-    } else
+    } else {
         qscale = get_bits(&row->gb, 11);
+    }
     act = get_bits1(&row->gb);
     if (act) {
         static int warned = 0;