aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorKieran <kierank@obe.tv>2014-06-14 19:25:09 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-06-15 23:24:11 +0200
commitbc21260e643c2249e38f7485bceada1d4bbb2b9a (patch)
treeeb4a5ef671697b435903d1957aa4a8eb54e23d9e /libavcodec
parentc1b15c16ef748777336222f57d753f3e6b095d7f (diff)
downloadffmpeg-bc21260e643c2249e38f7485bceada1d4bbb2b9a.tar.gz
hevc: Fix 4K sample video
Reviewed-by: smarter Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/hevc_ps.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/hevc_ps.c b/libavcodec/hevc_ps.c
index 647f83eec6..30e58a20b1 100644
--- a/libavcodec/hevc_ps.c
+++ b/libavcodec/hevc_ps.c
@@ -376,9 +376,10 @@ int ff_hevc_decode_nal_vps(HEVCContext *s)
goto err;
}
if (vps->vps_num_reorder_pics[i] > vps->vps_max_dec_pic_buffering[i] - 1) {
- av_log(s->avctx, AV_LOG_ERROR, "vps_max_num_reorder_pics out of range: %d\n",
+ av_log(s->avctx, AV_LOG_WARNING, "vps_max_num_reorder_pics out of range: %d\n",
vps->vps_num_reorder_pics[i]);
- goto err;
+ if (s->avctx->strict_std_compliance > FF_COMPLIANCE_NORMAL)
+ goto err;
}
}