[FFmpeg-cvslog] avcodec/utils: check skip_samples signedness

Michael Niedermayer git at videolan.org
Fri Aug 26 15:41:00 EEST 2016


ffmpeg | branch: release/2.8 | Michael Niedermayer <michael at niedermayer.cc> | Tue Jun  7 03:48:09 2016 +0200| [04987035ffca8cacb580002931abfe70df86a996] | committer: Michael Niedermayer

avcodec/utils: check skip_samples signedness

Fixes Ticket5528

Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
(cherry picked from commit 153ab83bd37cbbcc79d8303cc6efbf81089b8123)

Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

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

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

diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 892ddb9..cc28732 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -2629,7 +2629,7 @@ int attribute_align_arg avcodec_decode_audio4(AVCodecContext *avctx,
             skip_reason = AV_RL8(side + 8);
             discard_reason = AV_RL8(side + 9);
         }
-        if (avctx->internal->skip_samples && *got_frame_ptr &&
+        if (avctx->internal->skip_samples > 0 && *got_frame_ptr &&
             !(avctx->flags2 & AV_CODEC_FLAG2_SKIP_MANUAL)) {
             if(frame->nb_samples <= avctx->internal->skip_samples){
                 *got_frame_ptr = 0;



More information about the ffmpeg-cvslog mailing list