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

[James Almer]

On 11/24/2022 8:12 PM, Carl Eugen Hoyos wrote:
> Am Fr., 25. Nov. 2022 um 00:00 Uhr schrieb James Almer <jamrial at gmail.com>:
>>
>> Fixes ticket #10069
>>
>> Signed-off-by: James Almer <jamrial at 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.