From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 5C33245EFC for ; Mon, 17 Apr 2023 19:30:18 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A557468BE8A; Mon, 17 Apr 2023 22:30:07 +0300 (EEST) Received: from mail-yw1-f171.google.com (mail-yw1-f171.google.com [209.85.128.171]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E6AB068BB28 for ; Mon, 17 Apr 2023 22:30:00 +0300 (EEST) Received: by mail-yw1-f171.google.com with SMTP id 00721157ae682-54fdeddabd7so1564037b3.1 for ; Mon, 17 Apr 2023 12:30:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1681759799; x=1684351799; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ZTUeuBnteDtpeD0LjLOfAyxV+u9uQCiqmGDOdXejzu0=; b=AkYY4LeA9VQacAwdRzradZd2g5j9jRcBQVHro1uWWoqNY/QIkfr4mrXhaJxT9qEXCl ZTO9lzww9sOHLoiOrtX/tf3TgpwQ8SLGi0pkDOGYf5Ex1684k0gumBe0Z8e0f2rKX0ta LnmQdVBEBbQdTxBTK2DKCOa/JhHnZ2qYX+Rdk+aI/67UKKcSRTDHQdcAOj2vfFrF0fbL ARyYSwisNs5sVit7kF0UDlbEbrnvl/YMJySKA3i3YBpiO2MOIia/WGbNm2pGg8jybgpn p7ia3v5Azz0g2tkQLf+NYd7yj2X0G5KQsC1yyvkNUr0T6EfWq3EDmMtkQt811vfyP6Ig O/Cg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681759799; x=1684351799; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ZTUeuBnteDtpeD0LjLOfAyxV+u9uQCiqmGDOdXejzu0=; b=jjsO3cTmZLls9CEPoP7USz3U+kX4w3C8BeOSko+6kIjsfsWz8X7YY+PtXhU7e5zHbL L1xtHWztNObE+ug05J1gNLZEXTJpD4Xyg9BgfHhGCzU2Txy57SuvP0i2RZl9fiplRjT+ m8aKoFBSdShQPS2x7Vp9QoG6pnmKVKaAP+JA4Ar6jB82/z0JA/025WDmxAD7hJ2JZu70 ZlfDICFtnVzy269xbv4zmIPsVLLu42ucxu67ypUqiMNvOC+a4j7IoIe7JYODx/wpef03 Sv8UeBk1LeUG9d48z8VWv64zItrRL3Yb4gxQI+coeRp/+MGM3/w8gQYTg5e58jsb2HHb 2ipQ== X-Gm-Message-State: AAQBX9eP9mJJWx2OVwv/qN5B9RF8hARiVPOklq4urG724PYuz8AKmjTE RcFvD1sm1ZJWJ0phFfmdkAu8E0vQ5oc= X-Google-Smtp-Source: AKy350apxQloXSFKcG3aYh8O2E+/txTRwfe8IJQBQrWbz2qKR4tXbTz+Qjr3ut0pgLq+qoKqK2diEA== X-Received: by 2002:a81:1707:0:b0:53c:70c5:45d2 with SMTP id 7-20020a811707000000b0053c70c545d2mr13165813ywx.0.1681759799563; Mon, 17 Apr 2023 12:29:59 -0700 (PDT) Received: from ganymede.adsroot.itcs.umich.edu ([35.2.217.214]) by smtp.gmail.com with ESMTPSA id bg20-20020a05690c031400b0054c0118bdb1sm3259383ywb.60.2023.04.17.12.29.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Apr 2023 12:29:59 -0700 (PDT) From: Leo Izen To: ffmpeg-devel@ffmpeg.org Date: Mon, 17 Apr 2023 15:29:55 -0400 Message-Id: <20230417192955.25912-2-leo.izen@gmail.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230417192955.25912-1-leo.izen@gmail.com> References: <20230417192955.25912-1-leo.izen@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/1] avcodec/mjpegdec: fix non-subsampled RGB JPEGs 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 Cc: Leo Izen Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: The change introduced in b18a9c29713abc3a1b081de3f320ab53a47120c6 created a regression for non-subsampled progressive RGB jpegs. This should fix that. --- libavcodec/mjpegdec.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index 01537d4774..1e3ddb72fb 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -1698,7 +1698,8 @@ int ff_mjpeg_decode_sos(MJpegDecodeContext *s, const uint8_t *mb_bitmask, s->h_scount[i] = s->h_count[index]; s->v_scount[i] = s->v_count[index]; - if(nb_components == 3 && s->nb_components == 3 && s->avctx->pix_fmt == AV_PIX_FMT_GBRP) + if((nb_components == 3 || nb_components == 1) && s->nb_components == 3 + && s->avctx->pix_fmt == AV_PIX_FMT_GBRP && !s->progressive) index = (index+2)%3; s->comp_index[i] = index; -- 2.40.0 _______________________________________________ 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".