diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2016-06-07 03:48:09 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2016-08-13 13:08:57 +0200 |
| commit | 9cf85419a32dd1f52b224517a5e49879005c8375 (patch) | |
| tree | 5180a91011a5490c22d0897eec6fce4163388829 | |
| parent | b3fe93e73b18be9d8f9ac62b7e62407a47c834c3 (diff) | |
| download | android_external_ffmpeg-9cf85419a32dd1f52b224517a5e49879005c8375.tar.gz android_external_ffmpeg-9cf85419a32dd1f52b224517a5e49879005c8375.tar.bz2 android_external_ffmpeg-9cf85419a32dd1f52b224517a5e49879005c8375.zip | |
avcodec/utils: check skip_samples signedness
Fixes Ticket5528
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 153ab83bd37cbbcc79d8303cc6efbf81089b8123)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -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 f532824f45..fedbc476f7 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -2254,7 +2254,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; |