From 18108f36183836e9651f79f4c779737264318aa1 Mon Sep 17 00:00:00 2001 From: Sasi Inguva Date: Fri, 4 Nov 2016 15:31:58 -0700 Subject: [PATCH] lavc/utils.c: Make sure skip_samples never goes negative. Signed-off-by: Sasi Inguva Reviewed-by: Derek Buitenhuis Signed-off-by: Michael Niedermayer --- libavcodec/utils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 87de15fc62..d6dca180e7 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -2391,7 +2391,7 @@ int attribute_align_arg avcodec_decode_audio4(AVCodecContext *avctx, if ((frame->flags & AV_FRAME_FLAG_DISCARD) && *got_frame_ptr && !(avctx->flags2 & AV_CODEC_FLAG2_SKIP_MANUAL)) { - avctx->internal->skip_samples -= frame->nb_samples; + avctx->internal->skip_samples = FFMAX(0, avctx->internal->skip_samples - frame->nb_samples); *got_frame_ptr = 0; }