[FFmpeg-devel] [PATCH] avcodec/speexdec: fix frame_size for mode == 2

[FFmpeg-devel] [PATCH] avcodec/speexdec: fix frame_size for mode == 2

[James Almer]

Should match the non-extradata path now, and fix ticket #11078.

Signed-off-by: James Almer <jamrial@gmail.com>
---
 libavcodec/speexdec.c | 6 +++---
 1 file 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 ||
-- 
2.48.1

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".