From patchwork Fri Sep 30 17:23:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38486 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp1850249pzh; Fri, 30 Sep 2022 10:23:38 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7oKU8nzDt3gBCya2E6sMnWmSBYry5j8aVg0dFUQVqfrMuIbHHw5uxPVv1dSR1rwyGIiT6R X-Received: by 2002:a05:6402:4446:b0:457:eebd:fe52 with SMTP id o6-20020a056402444600b00457eebdfe52mr8626380edb.234.1664558618325; Fri, 30 Sep 2022 10:23:38 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id k14-20020a17090666ce00b00741d9a1e2dbsi1840507ejp.1004.2022.09.30.10.23.37; Fri, 30 Sep 2022 10:23:38 -0700 (PDT) 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=@outlook.com header.s=selector1 header.b=nOmNIcED; arc=fail (body hash mismatch); 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=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id EA2A968BBDC; Fri, 30 Sep 2022 20:23:34 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-oln040092073098.outbound.protection.outlook.com [40.92.73.98]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 272CF68BA95 for ; Fri, 30 Sep 2022 20:23:28 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Rn/LPvHu+RB50YLasqHEKoY9i9utxIWzB4Ppb3WI2yGq+xnsuYdDWwcKkqAYivA11wxl/00m7KUtcmwggWtVGOj0Sa2uV6ZjoJ4Yos/KDoInXAGd/jI75OuJuMujDO5pWkQzlEuODD3eCC2xk7Hl/mx/1sTGnjVEgHtjSl8V2uVJiU3dLQc3N0tZRip6qC6p2Y/Ik5/kOkczt1VyKYnpJinsCFynFOmhieZeAh5Ueq8JtRKgKgOT4+eBT2K5a40/0jE5aiSdD3i9REPXMk+igSjtjD/thzrbbTTQpDihKRIfdjjJEOnmvpWvXpW82keb83B56X/IcKaKwK+8CLzzbA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=23j1gGMzHaIK6KgBTSxbSuRhKlVguCLNOO72bHMOK8I=; b=Uq5ce2GigzSbBqRwHLInmzV6mcZWLPLsSGk6q2kpCG5EI9QXLwQA7Aa8vCLTF2l7H/N+AwD1Bt+izSqJS1ex5WEFgFt49SlQxVxrlie1jLYtKvcCLtIl5n8IVohUfguhRuVjPNktyVlL9v5EqV2LHxCcFmQw/Od7EgW5mh0ATrGYENRL+qYc6kPxSPlPQHPp2tGEWUXi0Ulgf1VLYUD6D4GYkT6U/EA25fUmesktFKYZp5n2zikYK4GJe7TCRVbT4d5SUHVULYzpL3y6wk7DXUnLp74D5fLlAdF+QFNDVb0FwdjW1n8y0n5By8+akcimIXSs0Hy7JBJGcHwkdQUZEw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=23j1gGMzHaIK6KgBTSxbSuRhKlVguCLNOO72bHMOK8I=; b=nOmNIcEDZr9BPXW1CyHcGNSjNb78soHDsq1CgBtAG6xh+L3dJnXGjJW05OlzhYh5WELypD7/B71COhdtANmkxqW2VMBbQXwARfd5bcD9HH60Fu4NkpZhtQm4/b64vfXtxjrmylpt8FymOs28XhDYTUjlGncQvRwW9gD1JldASR8h9C/H44asnjyK3Mw1FIftftQ1WG0PvYg2wgEV4tQcowQoYQOhhOky0wiq+FhPLOL51vhyvh3yZukocfK4pJaxAKjBzGgzIvYkdGI6+UTnov+eRSsiGoeqB3MuGRbj+S+xXIoCEFsTZNBdb1qZqnWQn+jtSNH3ElhTGfSW4cXotQ== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by GV1P250MB0811.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:9c::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5676.17; Fri, 30 Sep 2022 17:23:26 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::68bd:2fc7:ac52:38f8]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::68bd:2fc7:ac52:38f8%9]) with mapi id 15.20.5654.025; Fri, 30 Sep 2022 17:23:26 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 30 Sep 2022 19:23:26 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 X-TMN: [pTKDhEK4aYPRtsRY6SJEQGJG9jpTzMsSllKPE28nDUA=] X-ClientProxiedBy: FR3P281CA0028.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1c::19) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20220930172326.3656898-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|GV1P250MB0811:EE_ X-MS-Office365-Filtering-Correlation-Id: ddd17457-e36e-4182-719f-08daa3087bd2 X-MS-Exchange-SLBlob-MailProps: feAVlmA1hHWt4DLVZWJFH70LntyHTKMVytfVLvvV+nulfHZQV3d6fdUi4VRzGbqesQH9QSX5g4g5VPdZ6xKEo4SIorw1h6UQ/1aLZtpVQsIhBVhDBDwIgSXPHDYc9c5RZ0pibKlkNUc+gu2zH41HUDmjSZcA76OqZWkqPHxGLSuTaHY4IeCOoAyFhVlvdwajfYF03d+XT6nSpUTO9BOYSLqDKX31FWgqWd+9Rj+Dwmfh51ITFn+cK0d9FHdXuPjnpeZqStTCILnXo5qRqoEvVlCZtadZ8wUb0lK6qTNKV8U2iLiRzKwnpeE6hr5GHZGGcyJmQtq52drsRQyl8rUqivupFI5Q0P8FAfyHY58/qL5qco1LyCWXIXV2tFDDK03QG3c3tI0YaTZTEINrymsDDigqRqkZV/oiyws55hL/LQAGS26igjAAyuqe0CueQmxOvwITpylmz+rJ3f4h+a8F5K8X96v9uV5GTvqmzfi31SXWsMriuAL8PDde3zFRCdz7P18GrclCLWdwjPDcSvFEvLxuj0eTfuSVDDEi/F3Xo3rCUdKIblrtHu2V3FIBGf0SUCpADVXkbPpuXOPvIy9F4RH2jfCQqGFbp/aDVmCcfzULCgXq+CQ1DO4cS/LeZBH6VldnICMeRHCDVpYg5d4Zr+etAWhaoe6MVAED7+9H3emO/HC2QyA5mHU3GPUX2LnxXaHRXXrsUeGN8grGZxCB4A== X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 7iOqHl1dw5T6gLscIVSaQnRe6H4Q/L8Fwzg4lWlRU/tjBhiOjTBs+K9W3LGA2zpHGAtlfFFd0U8h/wXN/36/Ei+SLtjB+i94uAUfnESPuoxWt5pgDMR72PyOcQ1BK8Qxy+ABnakDePmbpJJ8pWnl2kkcU4UTDCu1U9MKbDmAhq8JcEE4+kfy0tBiK+p1jQMRMnKQAWpOzChIHl0hg0iBBP9ILDlyo+vl/UdElaNgGhS/qc4u/L/CbyYJYLKuHE8jK7WuNxPAGxYe5b0j1IYH/ESPiQT+qJlohA3Ot1U9f3C197PyvOT66SQErn1oCGIph7lYnnJZQp95bcXPPng5Nh2jo892nmmnTWk8Wjd3WxCKeGzSTnV6lP1W8LhtH0Hk6ImhDX9+bh7nrrs+AFVnH3SFNsrMfqOrilwDPBSqthyKg1OSU6bAqNSWsPaR0v4ylqvTQwyMDP7Q6uKX2b1nSFwlOumb2x8NkjzWcl3P7Fr5MbnwDz9QiBDMWfFiIChMUh0bYyS4hGrD8FFFv1ELaepr2IF5hpw3zuQi9NLhuRhG4s5uXTX6GuTgZwpOvVFBel/5PcAk5KKjS8pgsFOEcgp2IbRP06B6g5k8IcpNH/IMFF9VsomzAHlulGVGet2Vmz9vcilp8fu7WqLLjlQSSg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 3N5yt9B3osiioeXftnUyR7G2RzzKH+2t4skeDi5VKTwwLsEqmiWdatgIVWDJeCXlsQg3JdplsVKxo3qETz0zAFDJxXKcPVUAdhuGvN0gJv276gLInEBqwcuQh242umny3LJ+QY2KdzS15X9FatQ1aaWvOH/jdaRUTev8K9K+fN2r9H6W/sG9SRe0erhNbvdGvg+p+bXcWx1KmniJ+8PJMVxuNu6cHwNaT2ckncqnINIPNJkVrZfor9iv3GRx3afeaTcaCDLyPX73ieDSIz2hFZNDv1Svuc0TJsaekkaP3RkNEoWC0NwD3Zwi7nB8tk49kg+FDFgnPSZgugiTSUhFUfnP8ysj4xxXJXRp+H8u2pBipTnN9pIfZjonItVLQ6IXmreYJoKlxMxzdKTA62FBNw+Gaj+1Sd7WhzHaCTWZMFpNwg+dTZAKbQwzRsTR7GFHTXLrSw0JQpNipGo64CCfVGTL6Ob+qWHjVq2KHg6zraIsv2WpgmcG5yOEC50iKLGKoT98bIPh7iotXrRagilCA0stZfYiT/WfbLCpRsl7P2jZNYs9RR9VGGdhtflz7VJcIeHNCHYG7GU95rL+tdtA05kCtM5p4YTN5CH7A6zo//2Sb/eFjf8qEte7C7m6nXM2z4CGex3eS4T3SoXggqOtIe4frfIZLtwmrA58qs0YvfztTnR4S0mVA0UZI22Nv5np5IDI9MUy6+j84jvaHOYxL065dyXc08DCrSbIcGBQahNCu+/dWGTOgQaNPzHUhAGZ9cF9cdTA1HWK7jJh9paQZefR5PCG8Z/t9itKvVdkjJJiJWLfBsyq6YQMWpwuk3KeMOIZrita2LsQ+8DxQu86LEhIRAnqV4Dwo4zQWEwBjlPNa0dHswbjodPdeqSPJhes4mmOGhokPbajsQ3kHmf/3WDljPbkAjcCb1frEFZ2PBayodMJ+7pZtTFpW0CXlr5mnEf+Z6QEFour3w5L/jB1q71p7Ws9gQKXpgVanbR5rcoyeoxNQRL9fWjc/1vZ/qs7hFghT4OqGzGBZlxwW0vJ8rPv67Tnr+0Ot4ek+hIvRsXUieLApoOMYUmECuRxZRZiCAWTazol57hz68dKFLa5YYrlFtAlYRE3F7vUOvAs1EgMW3WkHvJjpKhgVZqGY6FMvj1HeAVCDzcNa87iUPzUtm1RN+6j+F9JIyknyzYhnHCQHrZE3jkZ1l/xBLi5MRs9ZyYVh05cnNoPhaOTkqFGqjfZijIOsQIbpdpB2oBJdMhEa9rna7jzGeEqAXKDrqb/otLuZcEc5KTuqe4z8MgXIpGwPlbeFnmgVbALcEAltkA= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: ddd17457-e36e-4182-719f-08daa3087bd2 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Sep 2022 17:23:26.1301 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: GV1P250MB0811 Subject: [FFmpeg-devel] [PATCH] avcodec/mjpegdec: Fix compilation 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 16iP3Kja4N/C Regression since 9a494b82d998823d0de68cb6b8db83cc451d1781. Signed-off-by: Andreas Rheinhardt --- libavcodec/mjpegdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index 85d1129f30..3374ae71bd 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -596,7 +596,7 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s) case 0x14111100: case 0x22211100: case 0x22112100: - if (s->component_id[0] == 'R' && s->component_id[1] == 'G' && s->component_id[B] == 'B') { + if (s->component_id[0] == 'R' && s->component_id[1] == 'G' && s->component_id[2] == 'B') { if (s->bits <= 8) s->avctx->pix_fmt = AV_PIX_FMT_GBRP; else goto unk_pixfmt;