summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2023-06-17 04:51:25 +0200
committerAnton Khirnov <anton@khirnov.net>2023-06-17 18:06:33 +0200
commit593e8c2c6ac0571df036c09bf103b7e58445d75d (patch)
tree67e8664db5debf950acf6813220ff9ced8bea283
parentf2349e7e628311bfbf217e821e4953052728863e (diff)
lavc/binkaudio: reset input packet on errors
Make sure we don't repeatedly try to decode the same packet, making no progress and possibly causing an infinite loop.
-rw-r--r--libavcodec/binkaudio.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/binkaudio.c b/libavcodec/binkaudio.c
index f28ecba760..265f93a822 100644
--- a/libavcodec/binkaudio.c
+++ b/libavcodec/binkaudio.c
@@ -325,7 +325,7 @@ again:
if (s->ch_offset == 0) {
frame->nb_samples = s->frame_len;
if ((ret = ff_get_buffer(avctx, frame, 0)) < 0)
- return ret;
+ goto fail;
if (!new_pkt)
frame->pts = AV_NOPTS_VALUE;
}
@@ -334,8 +334,8 @@ again:
avctx->codec->id == AV_CODEC_ID_BINKAUDIO_DCT,
FFMIN(MAX_CHANNELS, s->channels - s->ch_offset), s->ch_offset)) {
av_log(avctx, AV_LOG_ERROR, "Incomplete packet\n");
- s->ch_offset = 0;
- return AVERROR_INVALIDDATA;
+ ret = AVERROR_INVALIDDATA;
+ goto fail;
}
s->ch_offset += MAX_CHANNELS;
get_bits_align32(gb);