[FFmpeg-cvslog] avcodec/mjpegenc: take into account component count when writing the SOF header size

James Almer git at videolan.org
Mon Nov 28 13:47:31 EET 2022


ffmpeg | branch: release/4.2 | James Almer <jamrial at gmail.com> | Thu Nov 24 20:00:18 2022 -0300| [e228a0cccd31c2466ea968f34be4ec0da50bd792] | committer: James Almer

avcodec/mjpegenc: take into account component count when writing the SOF header size

Fixes ticket #10069

Signed-off-by: James Almer <jamrial at gmail.com>
(cherry picked from commit 100939695307743396e30e6310d2ea9cf42f9aab)

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e228a0cccd31c2466ea968f34be4ec0da50bd792
---

 libavcodec/mjpegenc_common.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/mjpegenc_common.c b/libavcodec/mjpegenc_common.c
index 31868c9bed..37c15367a4 100644
--- a/libavcodec/mjpegenc_common.c
+++ b/libavcodec/mjpegenc_common.c
@@ -275,7 +275,7 @@ void ff_mjpeg_encode_picture_header(AVCodecContext *avctx, PutBitContext *pb,
     default: av_assert0(0);
     }
 
-    put_bits(pb, 16, 17);
+    put_bits(pb, 16, 8 + 3 * components);
     if (lossless && (  avctx->pix_fmt == AV_PIX_FMT_BGR0
                     || avctx->pix_fmt == AV_PIX_FMT_BGRA
                     || avctx->pix_fmt == AV_PIX_FMT_BGR24))



More information about the ffmpeg-cvslog mailing list