[FFmpeg-cvslog] lavc/utils.c: Make sure skip_samples never goes negative.

Sasi Inguva git at videolan.org
Thu Nov 10 18:51:25 EET 2016


ffmpeg | branch: master | Sasi Inguva <isasi-at-google.com at ffmpeg.org> | Fri Nov  4 15:31:58 2016 -0700| [18108f36183836e9651f79f4c779737264318aa1] | committer: Michael Niedermayer

lavc/utils.c: Make sure skip_samples never goes negative.

Signed-off-by: Sasi Inguva <isasi at google.com>
Reviewed-by: Derek Buitenhuis <derek.buitenhuis at gmail.com>
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=18108f36183836e9651f79f4c779737264318aa1
---

 libavcodec/utils.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 87de15f..d6dca18 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;
         }
 



More information about the ffmpeg-cvslog mailing list