ffmpeg | branch: release/2.7 | Michael Niedermayer <michae...@gmx.at> | Thu Jun 18 18:03:21 2015 +0200| [6432f8826dd15ec9ce966249f4dc6933f94cf04f] | committer: Michael Niedermayer
avcodec/hevc_ps: Only discard overread VPS if a previous is available Fixes Ticket4621 Signed-off-by: Michael Niedermayer <michae...@gmx.at> (cherry picked from commit 57078e4d255a06246fef27846073f5ffb312b5dc) Signed-off-by: Michael Niedermayer <michae...@gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6432f8826dd15ec9ce966249f4dc6933f94cf04f --- 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 ced0600..757f666 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] && _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog