| Message ID | 20221124230051.2874-1-jamrial@gmail.com |
|---|---|
| State | Accepted |
| Commit | 100939695307743396e30e6310d2ea9cf42f9aab |
| Headers | show |
| Series | [FFmpeg-devel] avcodec/mjpegenc: take into account component count when writing the SOF header size | expand |
| Context | Check | Description |
|---|---|---|
| yinshiyou/make_loongarch64 | success | Make finished |
| yinshiyou/make_fate_loongarch64 | success | Make fate finished |
| andriy/make_x86 | success | Make finished |
| andriy/make_fate_x86 | success | Make fate finished |
Am Fr., 25. Nov. 2022 um 00:00 Uhr schrieb James Almer <jamrial@gmail.com>: > > Fixes ticket #10069 > > Signed-off-by: James Almer <jamrial@gmail.com> > --- > 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 6dfc4469a5..049ae3d929 100644 > --- a/libavcodec/mjpegenc_common.c > +++ b/libavcodec/mjpegenc_common.c > @@ -308,7 +308,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); Could this also fix #2967? Carl Eugen
On 11/24/2022 8:12 PM, Carl Eugen Hoyos wrote: > Am Fr., 25. Nov. 2022 um 00:00 Uhr schrieb James Almer <jamrial@gmail.com>: >> >> Fixes ticket #10069 >> >> Signed-off-by: James Almer <jamrial@gmail.com> >> --- >> 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 6dfc4469a5..049ae3d929 100644 >> --- a/libavcodec/mjpegenc_common.c >> +++ b/libavcodec/mjpegenc_common.c >> @@ -308,7 +308,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); > > Could this also fix #2967? > > Carl Eugen Doesn't look like. The examples in that ticket have all three components, which was the hardcoded len value (17) before this patch.
please unsuscribe. Harold F. Camargo R. Stream NG Cel. 318 3227862 Bogotá Colombia www.stream-ng.com El jue, 24 nov 2022 a las 18:24, James Almer (<jamrial@gmail.com>) escribió: > On 11/24/2022 8:12 PM, Carl Eugen Hoyos wrote: > > Am Fr., 25. Nov. 2022 um 00:00 Uhr schrieb James Almer < > jamrial@gmail.com>: > >> > >> Fixes ticket #10069 > >> > >> Signed-off-by: James Almer <jamrial@gmail.com> > >> --- > >> 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 6dfc4469a5..049ae3d929 100644 > >> --- a/libavcodec/mjpegenc_common.c > >> +++ b/libavcodec/mjpegenc_common.c > >> @@ -308,7 +308,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); > > > > Could this also fix #2967? > > > > Carl Eugen > > Doesn't look like. The examples in that ticket have all three > components, which was the hardcoded len value (17) before this patch. > _______________________________________________ > 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". >
diff --git a/libavcodec/mjpegenc_common.c b/libavcodec/mjpegenc_common.c index 6dfc4469a5..049ae3d929 100644 --- a/libavcodec/mjpegenc_common.c +++ b/libavcodec/mjpegenc_common.c @@ -308,7 +308,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))
Fixes ticket #10069 Signed-off-by: James Almer <jamrial@gmail.com> --- libavcodec/mjpegenc_common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)