aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-06-18 18:03:21 +0200
committerMichael Niedermayer <michaelni@gmx.at>2015-06-18 22:09:01 +0200
commit6432f8826dd15ec9ce966249f4dc6933f94cf04f (patch)
treec1ee803c2051c1b6383b0f671e307747fe5b49a0
parente04ae11fa06a6b156f077b91f4d7de9014c82006 (diff)
downloadffmpeg-6432f8826dd15ec9ce966249f4dc6933f94cf04f.tar.gz
avcodec/hevc_ps: Only discard overread VPS if a previous is available
Fixes Ticket4621 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 57078e4d255a06246fef27846073f5ffb312b5dc) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/hevc_ps.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/hevc_ps.c b/libavcodec/hevc_ps.c
index ced0600e32..757f66625c 100644
--- a/libavcodec/hevc_ps.c
+++ b/libavcodec/hevc_ps.c
@@ -499,7 +499,8 @@ int ff_hevc_decode_nal_vps(HEVCContext *s)
if (get_bits_left(gb) < 0) {
av_log(s->avctx, AV_LOG_ERROR,
"Overread VPS by %d bits\n", -get_bits_left(gb));
- goto err;
+ if (s->vps_list[vps_id])
+ goto err;
}
if (s->vps_list[vps_id] &&