diff options
| author | Vittorio Giovara <vittorio.giovara@gmail.com> | 2015-01-27 20:56:20 +0000 |
|---|---|---|
| committer | Vittorio Giovara <vittorio.giovara@gmail.com> | 2015-01-29 15:04:57 +0000 |
| commit | 1a07df31128da3a0020b66502399989b91770d44 (patch) | |
| tree | 26a43d2f50deb24a6a09d77ef5cb03c7c9f563ae /libavcodec/dnxhddec.c | |
| parent | 598f7d046cbf306706623210c5baafa3b7cd1df3 (diff) | |
DNxHD: Add support for id 1258 (DNx100 960x720@8)
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Diffstat (limited to 'libavcodec/dnxhddec.c')
| -rw-r--r-- | libavcodec/dnxhddec.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/libavcodec/dnxhddec.c b/libavcodec/dnxhddec.c index 9b1e48158d..eb00e86af3 100644 --- a/libavcodec/dnxhddec.c +++ b/libavcodec/dnxhddec.c @@ -165,6 +165,15 @@ static int dnxhd_decode_header(DNXHDContext *ctx, AVFrame *frame, if ((ret = dnxhd_init_vlc(ctx, cid)) < 0) return ret; + // make sure profile size constraints are respected + // DNx100 allows 1920->1440 and 1280->960 subsampling + if (ctx->width != ctx->cid_table->width) { + av_reduce(&ctx->avctx->sample_aspect_ratio.num, + &ctx->avctx->sample_aspect_ratio.den, + ctx->width, ctx->cid_table->width, 255); + ctx->width = ctx->cid_table->width; + } + if (buf_size < ctx->cid_table->coding_unit_size) { av_log(ctx->avctx, AV_LOG_ERROR, "incorrect frame size (%d < %d).\n", buf_size, ctx->cid_table->coding_unit_size); |