aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Almer <jamrial@gmail.com>2025-01-30 10:54:42 -0300
committerJames Almer <jamrial@gmail.com>2025-02-03 13:23:30 -0300
commit4a0e1cfc6f33d152e007849f6de7028d651de2af (patch)
tree1aeac36cf67475223b7387aefad8324d7f4394e2
parent49726a922fd2b358feb7753488d415180da5121c (diff)
downloadffmpeg-4a0e1cfc6f33d152e007849f6de7028d651de2af.tar.gz
avcodec/speexdec: fix frame_size for mode == 2
Should match the non-extradata path now, and fix ticket #11078. Signed-off-by: James Almer <jamrial@gmail.com>
-rw-r--r--libavcodec/speexdec.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/speexdec.c b/libavcodec/speexdec.c
index d25823ef6e..b335e2fbe8 100644
--- a/libavcodec/speexdec.c
+++ b/libavcodec/speexdec.c
@@ -1422,10 +1422,10 @@ static int parse_speex_extradata(AVCodecContext *avctx,
return AVERROR_INVALIDDATA;
s->bitrate = bytestream_get_le32(&buf);
s->frame_size = bytestream_get_le32(&buf);
- if (s->frame_size < NB_FRAME_SIZE << (s->mode > 0) ||
- s->frame_size > INT32_MAX >> (s->mode > 0))
+ if (s->frame_size < NB_FRAME_SIZE << (s->mode > 1) ||
+ s->frame_size > INT32_MAX >> (s->mode > 1))
return AVERROR_INVALIDDATA;
- s->frame_size <<= (s->mode > 0);
+ s->frame_size <<= (s->mode > 1);
s->vbr = bytestream_get_le32(&buf);
s->frames_per_packet = bytestream_get_le32(&buf);
if (s->frames_per_packet <= 0 ||