From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id 192974BAFF for ; Mon, 29 Dec 2025 14:15:29 +0000 (UTC) Authentication-Results: ffbox; dkim=fail (body hash mismatch (got b'a2SL6TRaQSwyIHFIzgi+vhkKGxWSZ2h8cpno7vxC5PI=', expected b'wwc4Y3/ht0Bht9SJTpU+hJNrqJgmzpUobGZrck/d1s8=')) header.d=ffmpeg.org header.i=@ffmpeg.org header.a=rsa-sha256 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ffmpeg.org; i=@ffmpeg.org; q=dns/txt; s=mail; t=1767017720; h=mime-version : to : date : message-id : reply-to : subject : list-id : list-archive : list-archive : list-help : list-owner : list-post : list-subscribe : list-unsubscribe : from : cc : content-type : content-transfer-encoding : from; bh=a2SL6TRaQSwyIHFIzgi+vhkKGxWSZ2h8cpno7vxC5PI=; b=otLyLyaQPxDfpvNEy5wrHiKDU7ONrvnUYnFC9joFHFmSgxnBXANnVVTl+laIOmhNEicDi L+K5Y+AFzkMJwFKUgnpkcTD0zrtrtPhi4dCcQRtqfw+FDh4ROWVLVQ4cb2tDZHeSXqUUq6r n6m0a4b2f2KGgPxUSHELeTmT9hWdsrNr3acuA4Gpd6/946PbwmqpzduzHiX+oD464KSZ68E eRL3FNhrQql7daAINND6VB8+sIbEzo3FJh5rS5uEQ0CpgrGx8MINY9Q0rdZP1hyyKulj4G3 elILMyUPu3q31XVjtTdwpGys5GgKMypO3MxQ7T+4qq85QGXr5QTWCyI8Htlg== Received: from [172.20.0.4] (unknown [172.20.0.4]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 36CEA690CA6; Mon, 29 Dec 2025 16:15:20 +0200 (EET) ARC-Seal: i=1; cv=none; a=rsa-sha256; d=ffmpeg.org; s=arc; t=1767017704; b=c5kgThNV8yVphdlYQvEcRHoBOwoKlE+JkFsVjJIiIYNpoSrp6hDXcKrkYdaeeFfaHgw9X 5NuZ/s8taihm6EglQYC4JDSGrzvaWjQg5iR4erqnR45ZCiln459/vGQm3H1OxZic9ZdH9UL ROBezruDxq1brbo4klM2R06c8wXL43cL5hxH7UEYd3x2XLV9siuaNQFVP/VEC0EYeQnJak0 6LuH8vCleLd2Ut1lQS0Y9wDys9y9vMHFF7EkrY+xSNWfHkKNsoY94f1obDPu0O6hOjgp9ai gNbBCg5soWkxZc9iPAJ1/2FANMMtO1SRw/r5NNx7ArJ3Naddb30ojeYa3Q+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=ffmpeg.org; s=arc; t=1767017704; h=from : sender : reply-to : subject : date : message-id : to : cc : mime-version : content-type : content-transfer-encoding : content-id : content-description : resent-date : resent-from : resent-sender : resent-to : resent-cc : resent-message-id : in-reply-to : references : list-id : list-help : list-unsubscribe : list-subscribe : list-post : list-owner : list-archive; bh=KMCfLPxBxxfrGEoOFyVNT8pKYCtJjNpXXx4H1T9EM5o=; b=T868+9X7JHHziwh6ILc87yZUu3QHXYewZIvEC49Kc7bFL22rHNfos6W/W0Kd3agCc3Plz EgTPY+pOLZ1WwBIZka2nMOsVDLBlT46MWwgj9xNZ0P9jR8cnkw8Ad+z81wiNM8llwikDV/S y1r/1oh1Cty5ACLSOSSEsROx1p9U9PY11NrCnaflwhtffFggPMjl+77+PCYrC9iDbXgpEig ZxJMOdyZpbA1CBwZLtGrW5AyjDWytrOBfFUfN4nh6sSfRs6kSrZAV7Svz5rPZBUKSTWO/cr hUEUA4TvW/jPFSjg/CRM2TY3gemUbE/AO84CDl8ODASFMWMZvN2WSofJqpBA== ARC-Authentication-Results: i=1; ffmpeg.org; dkim=pass header.d=ffmpeg.org header.i=@ffmpeg.org; arc=none; dmarc=pass header.from=ffmpeg.org policy.dmarc=quarantine Authentication-Results: ffmpeg.org; dkim=pass header.d=ffmpeg.org header.i=@ffmpeg.org; arc=none (Message is not ARC signed); dmarc=pass (Used From Domain Record) header.from=ffmpeg.org policy.dmarc=quarantine DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ffmpeg.org; i=@ffmpeg.org; q=dns/txt; s=mail; t=1767017696; h=content-type : mime-version : content-transfer-encoding : from : to : reply-to : subject : date : from; bh=wwc4Y3/ht0Bht9SJTpU+hJNrqJgmzpUobGZrck/d1s8=; b=rL10UU/pWjUAOdtlzJKjTHqELEbZDqS2hGs3ggYH5xSgLTnnsK+eqHAbbNAn41MB5YZmU xHV/MhYpGO9Rwag29ZzuCrPj4JW4HfL4lASHiaBo8EwagzIC6RXkZGHbo2rThGAU0zQidiu 7VgkPl58zFPHaqkzJu92uw3idWC9kuScSFXsdDymAsCv4xXN9a/qJManar8MHOVbznw6ILv UzDdpKGH5bELtatMYigBYUqEscMgVYP5EBfJdCQTDku0h+/AJe5zvzUItID3pvl3se5FtVH btQ/XMOoNMq66meQ3uaEdStVeNGYmXvm1K9NQjtcjf4l8S375clfdy+2PHJA== Received: from 55ca25703178 (code.ffmpeg.org [188.245.149.3]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id 73A1768FF1F for ; Mon, 29 Dec 2025 16:14:56 +0200 (EET) MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Date: Mon, 29 Dec 2025 14:14:56 -0000 Message-ID: <176701769659.25.14942349348377277702@4457048688e7> Message-ID-Hash: XKOQCYFBQJQLCK274FA2ANAFG7SZOCEG X-Message-ID-Hash: XKOQCYFBQJQLCK274FA2ANAFG7SZOCEG X-MailFrom: code@ffmpeg.org X-Mailman-Rule-Hits: nonmember-moderation X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-ffmpeg-devel.ffmpeg.org-0; header-match-ffmpeg-devel.ffmpeg.org-1; header-match-ffmpeg-devel.ffmpeg.org-2; header-match-ffmpeg-devel.ffmpeg.org-3; emergency; member-moderation X-Mailman-Version: 3.3.10 Precedence: list Reply-To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] [PATCH] avcodec/jpegls: rename SOF48 to SOF55 (PR #21310) List-Id: FFmpeg development discussions and patches Archived-At: Archived-At: List-Archive: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Ramiro Polla via ffmpeg-devel Cc: Ramiro Polla Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Archived-At: List-Archive: List-Post: PR #21310 opened by Ramiro Polla (ramiro) URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/21310 Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/21310.patch SOF48 (0xf0) was used in a public draft of the standard (FCD 14495). In the final specification it is called SOF55 (0xf7). >>From 2ae359e8e29b2c44de06223c1faedc5b6ffecfad Mon Sep 17 00:00:00 2001 From: Ramiro Polla Date: Mon, 13 Oct 2025 17:24:07 +0200 Subject: [PATCH] avcodec/jpegls: rename SOF48 to SOF55 SOF48 (0xf0) was used in a public draft of the standard (FCD 14495). In the final specification it is called SOF55 (0xf7). --- libavcodec/jpeglsenc.c | 2 +- libavcodec/mjpeg.h | 2 +- libavcodec/mjpegdec.c | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libavcodec/jpeglsenc.c b/libavcodec/jpeglsenc.c index edc3fa600c..64440de242 100644 --- a/libavcodec/jpeglsenc.c +++ b/libavcodec/jpeglsenc.c @@ -373,7 +373,7 @@ static int encode_picture_ls(AVCodecContext *avctx, AVPacket *pkt, /* write our own JPEG header, can't use mjpeg_picture_header */ put_marker_byteu(&pb, SOI); - put_marker_byteu(&pb, SOF48); + put_marker_byteu(&pb, SOF55); bytestream2_put_be16u(&pb, 8 + comps * 3); // header size depends on components bytestream2_put_byteu(&pb, (avctx->pix_fmt == AV_PIX_FMT_GRAY16) ? 16 : 8); // bpp bytestream2_put_be16u(&pb, avctx->height); diff --git a/libavcodec/mjpeg.h b/libavcodec/mjpeg.h index cd5d0af2ac..e66e39714d 100644 --- a/libavcodec/mjpeg.h +++ b/libavcodec/mjpeg.h @@ -100,7 +100,7 @@ enum JpegMarker { JPG4 = 0xf4, JPG5 = 0xf5, JPG6 = 0xf6, - SOF48 = 0xf7, ///< JPEG-LS + SOF55 = 0xf7, ///< JPEG-LS LSE = 0xf8, ///< JPEG-LS extension parameters JPG9 = 0xf9, JPG10 = 0xfa, diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index 05150e982c..4448a8dccb 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -2428,7 +2428,7 @@ redo_for_pal8: ret = -1; if (!CONFIG_JPEGLS_DECODER && - (start_code == SOF48 || start_code == LSE)) { + (start_code == SOF55 || start_code == LSE)) { av_log(avctx, AV_LOG_ERROR, "JPEG-LS support not enabled.\n"); return AVERROR(ENOSYS); } @@ -2439,7 +2439,7 @@ redo_for_pal8: case SOF1: case SOF2: case SOF3: - case SOF48: + case SOF55: break; default: goto skip; @@ -2493,7 +2493,7 @@ FF_ENABLE_DEPRECATION_WARNINGS if ((ret = ff_mjpeg_decode_sof(s)) < 0) goto fail; break; - case SOF48: + case SOF55: avctx->profile = AV_PROFILE_MJPEG_JPEG_LS; #if FF_API_CODEC_PROPS FF_DISABLE_DEPRECATION_WARNINGS @@ -2588,7 +2588,7 @@ eoi_parser: case SOF1: case SOF2: case SOF3: - case SOF48: + case SOF55: s->got_picture = 0; goto the_end_no_picture; } -- 2.49.1 _______________________________________________ ffmpeg-devel mailing list -- ffmpeg-devel@ffmpeg.org To unsubscribe send an email to ffmpeg-devel-leave@ffmpeg.org