Merge commit '5980c924e309ae1dde8bd52d9938f94ff02602eb'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 9 Apr 2015 18:26:07 +0000 (20:26 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 9 Apr 2015 18:26:18 +0000 (20:26 +0200)
* commit '5980c924e309ae1dde8bd52d9938f94ff02602eb':
  dnxhd: Log the selected profile id

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/dnxhddec.c

@@@ -85,11 -79,8 +85,12 @@@ static int dnxhd_init_vlc(DNXHDContext 
              av_log(ctx->avctx, AV_LOG_ERROR, "unsupported cid %d\n", cid);
              return AVERROR(ENOSYS);
          }
 +        if (ff_dnxhd_cid_table[index].bit_depth != ctx->bit_depth) {
 +            av_log(ctx->avctx, AV_LOG_ERROR, "bit depth mismatches %d %d\n", ff_dnxhd_cid_table[index].bit_depth, ctx->bit_depth);
 +            return AVERROR_INVALIDDATA;
 +        }
          ctx->cid_table = &ff_dnxhd_cid_table[index];
+         av_log(ctx->avctx, AV_LOG_VERBOSE, "Profile cid %d.\n", cid);
  
          ff_free_vlc(&ctx->ac_vlc);
          ff_free_vlc(&ctx->dc_vlc);