From ab296c7a9fe590860dc95ba97e9cbb9dde798f20 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Wed, 15 Jan 2014 04:30:41 +0100 Subject: [PATCH] avcodec/hevc_ps: Override max_dec_pic_buffering when its inconsistent with num_reorder_pics Fixes Ticket3304 Alternatively max_dec_pic_buffering could be removed completely as its not used. Based on a patch by Jose Santiago Signed-off-by: Michael Niedermayer --- libavcodec/hevc_ps.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libavcodec/hevc_ps.c b/libavcodec/hevc_ps.c index 1684d77672..24968cce03 100644 --- a/libavcodec/hevc_ps.c +++ b/libavcodec/hevc_ps.c @@ -763,8 +763,11 @@ int ff_hevc_decode_nal_sps(HEVCContext *s) if (sps->temporal_layer[i].num_reorder_pics > sps->temporal_layer[i].max_dec_pic_buffering - 1) { av_log(s->avctx, AV_LOG_ERROR, "sps_max_num_reorder_pics out of range: %d\n", sps->temporal_layer[i].num_reorder_pics); - ret = AVERROR_INVALIDDATA; - goto err; + if (sps->temporal_layer[i].num_reorder_pics > MAX_DPB_SIZE - 1) { + ret = AVERROR_INVALIDDATA; + goto err; + } + sps->temporal_layer[i].max_dec_pic_buffering = sps->temporal_layer[i].num_reorder_pics + 1; } }