From patchwork Thu Nov 24 23:00:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 39407 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp4871209pzb; Thu, 24 Nov 2022 15:00:46 -0800 (PST) X-Google-Smtp-Source: AA0mqf7dfUDvukkfJ4ARURUdFEKRg2hl4UkLABD4FmSSIeLXlLZum2rmF9VqVO+9aI8ih2qo/YEm X-Received: by 2002:a17:906:4b04:b0:7b9:a75b:faf9 with SMTP id y4-20020a1709064b0400b007b9a75bfaf9mr8974746eju.473.1669330845833; Thu, 24 Nov 2022 15:00:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669330845; cv=none; d=google.com; s=arc-20160816; b=qVxLX1IgICvDeh1JIuY7bon1XKBLHfEZ83NfB27JFCRZFk+WX/QV9bd3UZLNtNcAzZ mMJJQzQB4LSRDTtbiXa/oVU41tCSEiIhRHhqYIrXGJf0w6eBnba0PMSn3BPnqfq0ZZ/r L+Pty7U8lfCWyYDcWCZRDQbDJ1UC8lPZQtbj0uyf9pfFfTYN5ayOdwuRC+mqE9SHP/bC Z9g5TEJlpW+y+QBf8UvncXMk8FPt0VjwnX2FMFOKQViz+Mee3b9Jp7cvdJGuPdO2pTmt 7SibcOssiq0fe7QoB7vOnqEUm+BFNS6x8DQTdAETg5vbLXBscj6z9MU7vaRCJzuumpdO OS8w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=vRzIr/a+fkbyTiMwUSBi8HeI+Eqlyl+6rcPuVb1foZQ=; b=eM6cvOgi4NvPYLTpvjtVp4x6BQTMbZLlCWrvmfQOTGC1MZ9Q6f8MPggTvnTogBJzw5 KFhuueidH0NspStmhk70P2gRYWFWnYBn/JoDN9q19EGt+2M+uBC4Im9CC0WAnWTG9pG7 j/+fHnPGMMdGoYBGHck2pmnPUI8heRcHxY1VM5t4kry9GW3HNu4Fwl+KV9aGxfxSraNb NodU8UEt0fFGx6/bkdKWF4mf5pDwSeoyndfQuOVY8GWozcFOOAbbw9u7kmoThQzjxyk4 p3OtvF86JlAo0bCvR1NhNkzVskEPh9vYS0vO3X7e7BLBk/+d8TsuF2CTTTb1B0D/PhG/ uABg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=nz61xlFP; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id hb17-20020a170907161100b00773db392e1esi2091629ejc.997.2022.11.24.15.00.42; Thu, 24 Nov 2022 15:00:45 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=nz61xlFP; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7C1D368B9D0; Fri, 25 Nov 2022 01:00:39 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oa1-f43.google.com (mail-oa1-f43.google.com [209.85.160.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1091F6899CC for ; Fri, 25 Nov 2022 01:00:33 +0200 (EET) Received: by mail-oa1-f43.google.com with SMTP id 586e51a60fabf-1432a5f6468so3304961fac.12 for ; Thu, 24 Nov 2022 15:00:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=ibp5LGFdcUVg0nQgp9bA/4lFRoxpIBDvrS/W9+GOP/8=; b=nz61xlFPnNYtoysK5XZe3+5vXl+QRNNEFI/dW9+faV7AN9GbGoEsH27uh6O2tIOjgk ZuiU+mvclVFJs8JcryHWJCwwzUevpJMQqA4E/JYFHEbxEYKYee+G+cEbfYhDpTaIRzIt iG3ORwmS4pJMuT2bY1iU/yITUpN5YkWytIm0cjb4W2hZe5Akgyns1qTyWh6NV9+r6+eR HTOYrP5qc5fcUGKGDuci2torB+em+lSlSU5IaaZOp8e5UnVCZ0IP3MR0dhS8B/6e8TlX EXfIOAI+mutV96M3qOFsuNBx/OAHFVDf61ZESFP39iWmUAUvTJpOGsZj6hM9rs+d2Jp6 zhCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=ibp5LGFdcUVg0nQgp9bA/4lFRoxpIBDvrS/W9+GOP/8=; b=yVtM0paSrIT/jQjXwqBoF2S8Ur5yjUx9Qx7zlleRTqTGtno76nCltHXXJPRc75+WoH Ma32hlR3hJ88OEGEvZJXa9goPbzWSO2S0mjPAhxfF57qT/5reHvi+fdVn6D5SVSIlRMW wfF4DtLTD/7KfyU3af5bunlC7g6ceewgIAOzM8GF7fg4sqnfwMTCZ3pUp2rlvlNqVysX eQxpc98loziBzP8VrAm1+JpvEWOeIgkO4T23ak6e4m5fhhA54hRsfI27Nkg5Lr9TsMnT 0yXqzaecnkjONB5M0OVvZF2oZ5L+5oak0SHJDUZxGK0zlwWhFJknzlyN69wBTm5gL/G1 jSbA== X-Gm-Message-State: ANoB5pl6Yr0FGaV0+dOX7WQq9KmovjrTo3AA/3oHuXduVGmDpso0v7nY YkElgxRPG4j3If3h34LGGw2dPi4jbs8= X-Received: by 2002:a05:6870:4e0d:b0:13b:470:6108 with SMTP id pl13-20020a0568704e0d00b0013b04706108mr12805433oab.168.1669330831046; Thu, 24 Nov 2022 15:00:31 -0800 (PST) Received: from localhost.localdomain ([181.85.72.69]) by smtp.gmail.com with ESMTPSA id l9-20020a9d7a89000000b00667d9a866b0sm893154otn.59.2022.11.24.15.00.29 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Nov 2022 15:00:30 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Thu, 24 Nov 2022 20:00:51 -0300 Message-Id: <20221124230051.2874-1-jamrial@gmail.com> X-Mailer: git-send-email 2.38.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/mjpegenc: take into account component count when writing the SOF header size X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: YFBOWBCUpnDf Fixes ticket #10069 Signed-off-by: James Almer --- 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); if (lossless && ( avctx->pix_fmt == AV_PIX_FMT_BGR0 || avctx->pix_fmt == AV_PIX_FMT_BGRA || avctx->pix_fmt == AV_PIX_FMT_BGR24))