Merge commit '5980c924e309ae1dde8bd52d9938f94ff02602eb'

michaelni · michaelni · commit 72a580268ff9 · 2015-04-09T20:26:18.000+02:00
* commit '5980c924e309ae1dde8bd52d9938f94ff02602eb':
  dnxhd: Log the selected profile id

Merged-by: Michael Niedermayer &lt;michaelni@gmx.at&gt;
diff --git a/libavcodec/dnxhddec.c b/libavcodec/dnxhddec.c
@@ -90,6 +90,7 @@ static int dnxhd_init_vlc(DNXHDContext *ctx, uint32_t cid)
             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);

Original file line number	Diff line number	Diff line change
`@@ -90,6 +90,7 @@ static int dnxhd_init_vlc(DNXHDContext *ctx, uint32_t cid)`
`90`	`90`	`return AVERROR_INVALIDDATA;`
`91`	`91`	`}`
`92`	`92`	`ctx->cid_table = &ff_dnxhd_cid_table[index];`
	`93`	`+ av_log(ctx->avctx, AV_LOG_VERBOSE, "Profile cid %d.\n", cid);`
`93`	`94`
`94`	`95`	`ff_free_vlc(&ctx->ac_vlc);`
`95`	`96`	`ff_free_vlc(&ctx->dc_vlc);`