diff options
author | Michael Niedermayer <michael@niedermayer.cc> | 2016-06-07 03:48:09 +0200 |
---|---|---|
committer | Michael Niedermayer <michael@niedermayer.cc> | 2016-06-07 04:31:39 +0200 |
commit | 153ab83bd37cbbcc79d8303cc6efbf81089b8123 (patch) | |
tree | e477fa1579b596111fb59c1e57f91fade6369e83 /libavcodec | |
parent | 77d4dfbec69f6697ba8931ffa8833bf9bda96ce6 (diff) | |
download | ffmpeg-153ab83bd37cbbcc79d8303cc6efbf81089b8123.tar.gz |
avcodec/utils: check skip_samples signedness
Fixes Ticket5528
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec')
-rw-r--r-- | libavcodec/utils.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 4016583174..402a9d8f03 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -2346,7 +2346,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; |