From 57078e4d255a06246fef27846073f5ffb312b5dc Mon Sep 17 00:00:00 2001
From: Michael Niedermayer <michaelni@gmx.at>
Date: Thu, 18 Jun 2015 18:03:21 +0200
Subject: [PATCH] avcodec/hevc_ps: Only discard overread VPS if a previous is
available
Fixes Ticket4621
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
---
libavcodec/hevc_ps.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
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] &&
--
2.18.1