From patchwork Mon Apr 12 17:07:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 26884 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id B410844B50B for ; Mon, 12 Apr 2021 20:08:05 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8E438688158; Mon, 12 Apr 2021 20:08:05 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-oln040092074017.outbound.protection.outlook.com [40.92.74.17]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BF86D680972 for ; Mon, 12 Apr 2021 20:07:59 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LI8ij5/4KQjU1A7JKCChASSIOgMfpH3ghMATcXB1+gRo9w6ZqKZCUi2vgHn4nANHcn/KXLNKD/BsQMOu06Jq2kg39ZvxJoqyVL/tkqpVH5Ld1pXB9aIlZmipAuaXvQGDXttB2UaOLtI6Y/Z02x3uxQFgMw2qnxEnmO7WqbSQPUyf7PnSL8LyoWj5Muamwnnnki2CG/VuB36BCTOeTzUAC8+EQxVm8CUN81aRth2kB9vj/HpU7cfUt9qVB6rEFFuEG32JFJ2Gozwf216OmzA+IbRMQn6TbATn2iY7ZxDY3SQsXsfL/xJbRyselvvLWa6I9HVs2j4GMhJ3kFgTAinDCQ== 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-SenderADCheck; bh=hP3qfxjgo5bDr//WMFr3pB/Ni73aj7EX5+gMCk4xTSs=; b=df4LLdTQPoeCCXRhowlsTxUWreHQSdO7lL84QeBgE4XbIwvkEt/JQwe9jLoPPEn2TvCljyOLf4Bk3oohOmKC9pZsmBWMbhyoLgJT2kWHKVDKD9eYHpW9cyeAoh9VI0i5twXRe547qJlp8hmtaFLoOZhvyscdFC5tHKKwbo0EMlzTN7J10jNQDGOtrHxI/0aGxD1zNpE5Hafe/kE1hUu3rsM8NLSLIZQGh41gvS/JwaRA0+OcMm87Bf+velCbYXWjlIXyFN9foi4tDJZUEAXuBcD4mbbl0SqClg+v433Fr2yVCfD/I9m7Nw9GaX6VRvMSCV7XTH0UVKao6lC2edmQYQ== 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=hP3qfxjgo5bDr//WMFr3pB/Ni73aj7EX5+gMCk4xTSs=; b=n+lPtVHdAZ/7fT9y5SnG+/sVi18iyRBPZaeT2eNzntUGPIxbzsuYKaBtx+ufcdFLYOtGGIl02oToZmHBGXX8E67SUWFv8WLH8BUQ0p+4+nD3sYFvFfKb47RUkFUwVM+MNq0uG7LgFGg9bzZDjhVfwh3jbqjUszq2u1SG2KYOWa9iGIGXvfwBqHRCLujg45J67r7KMqJXNWgK6QPrKu/XOipGf15U5yp75itJtYa6P8PzLQFARiJ3i6f9nSzc/ELtvC/oE6BpvixvAldElXh2TVjWOKfYETLmLIPUvqrlRQrAKcW47nwQeEAwAqYCTc9ceOnKX3lUlFbLwqmMuAswnw== Received: from VI1EUR04FT059.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0e::51) by VI1EUR04HT084.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0e::249) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4020.17; Mon, 12 Apr 2021 17:07:58 +0000 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com (2a01:111:e400:7e0e::41) by VI1EUR04FT059.mail.protection.outlook.com (2a01:111:e400:7e0e::117) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4020.17 via Frontend Transport; Mon, 12 Apr 2021 17:07:58 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:FD64C78D75B77B6CE253ABBBBD87F3F3209B0B15D3E7264EBE6B12EB3A61C088; UpperCasedChecksum:948C4FE3A667B5EE2E93C1B01F91522C33FC612BA3A1794BFADE3A77F57FF27A; SizeAsReceived:7376; Count:46 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::8128:5de5:4e94:9a21]) by HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::8128:5de5:4e94:9a21%3]) with mapi id 15.20.4020.022; Mon, 12 Apr 2021 17:07:52 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 12 Apr 2021 19:07:43 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 X-TMN: [H+7Vwpiuhk6EtBS20w+graP/JvpQrzH5] X-ClientProxiedBy: PR2P264CA0001.FRAP264.PROD.OUTLOOK.COM (2603:10a6:101::13) To HE1PR0301MB2154.eurprd03.prod.outlook.com (2603:10a6:3:2a::22) X-Microsoft-Original-Message-ID: <20210412170743.92425-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.137.96) by PR2P264CA0001.FRAP264.PROD.OUTLOOK.COM (2603:10a6:101::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4020.17 via Frontend Transport; Mon, 12 Apr 2021 17:07:51 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 46 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: a25c0bbd-65aa-442f-e912-08d8fdd581ca X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiRXnRLftrGqVlM4C3ZoKQ6CYs3FK47gOw/TXlEV/TtFXNI+IHOkUHHIkOlASBz3PdPjv9aXYog/+cA6kAC5w1dikpBwiK/79YTFDX0XcJI/tHEi++5ROBdI1EreWulhkJI+AG3DsvA6lRg41dnWAj6tU1h1FxUm12P9JrUwCyxG1TeVy7vPOSdq0n33e8jlY4mw76EQ1j5tWrHha4uKRJW/97VnyMK0+eSzdayklT22YSijyM+E4wiZ9JTcHAcxCJTBBwkdkgx2RtNb5psV3b5t3OCx7lhQWqYyHbiB048Qghb4G4teTxw3Pk/YeDt5fmhR0nT9+EAJlHK0YC7kvUZervhL/F4mEVPRJJ406xLIPcHDQ4B6p4jdExlFw4pv1XUmeTgSQ2SEQ9uknAGTj9WdFdpjLHAI3J4u9O9Y9aUkWEtXoQ8LJl2U+A9ENUuC0f2XyMqY0sMM1MbooYqYn/I2xTQUbaikdfXiowPpcEtXb1eSjIVzOvy+mn0W3LWhS+NJXt0F78jYN0Yzia4qNs8KMAwtp2fNtfOe9KhCo2Cb5xv93l33VTUX+wM2k0pdEbzuqHWiBdOVr5GfgtbRT2YUyURzBOyZi+s7Vy15wzMRqgrA3teBCGjFi6rvFO6bX2OI6qoatWDBN/T+U5Rf3sho4zEz6Zx+60A2e3hL5ctUwwipTDdfHevw5ULjSAprJ0Hqb9rxoyGD4z6ajZ4UgHzdOeV/ys8l2i4Yk6YHqGRT0snt0p31IGDoghUwon11Z04= X-MS-TrafficTypeDiagnostic: VI1EUR04HT084: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: qVkBNmmH6JIOw8/Gc8/wQs40GxTmTlXti/AeRxzxh24pOgCn19ip2zDb4SGs5/m7Vp7RJC332ZU4xqRyP3veod5aYYKjB1OIUXbdyyVt9ZgYAiuM73el0/NW0Axye7mjB9zA1AvwHDJZr/ebjOhqVdJL9bupmkqQ+9/q/U5XmtzX14fDEqmftkA/rvZwpu4hXpTrdlsXw3A9iYzNyaL8iStDlbUM8Dg6lNf+iKxMVpgiignQbfhhzaQ3K2k53H1Z4E6Sc1MIjpMZ9MeuEiumSpSajlLJkatHo0LRjkgZJ5wQD0TTJjvnslHwzavYTR/USUV5BgvvnNbJWD8N7YnlST87S80Xur0ZKFUldWmpMDt1nYSUrA0F5Fewb6UioHCzBBPEELIB2inZPpiIJ2fM3g== X-MS-Exchange-AntiSpam-MessageData: qWIij2K3KB5BitX+tgChxG5KQyhCufHCfM79MmQ/J7w8MzUxIBsmNxzedHLhGIbldvQY4N+DA0dr4/8ikBVTQBdOsRNqDO56ztaev+vxFMYPBdlYeItwLfv1vpy40B0fRdsL3nE7GCIG6vuLEvsFzQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: a25c0bbd-65aa-442f-e912-08d8fdd581ca X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Apr 2021 17:07:52.3563 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: VI1EUR04FT059.eop-eur04.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: Internet X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1EUR04HT084 Subject: [FFmpeg-devel] [PATCH] avcodec/jpeglsenc: Remove redundant pixel format checks X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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" This encoder has AVCodec.pix_fmts set, so ff_encode_preinit() already checks for this. Signed-off-by: Andreas Rheinhardt --- Will apply tomorrow unless there are objections. libavcodec/jpeglsenc.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/libavcodec/jpeglsenc.c b/libavcodec/jpeglsenc.c index 2bb6b1407a..d03ce32f41 100644 --- a/libavcodec/jpeglsenc.c +++ b/libavcodec/jpeglsenc.c @@ -429,14 +429,6 @@ FF_DISABLE_DEPRECATION_WARNINGS FF_ENABLE_DEPRECATION_WARNINGS #endif - if (ctx->pix_fmt != AV_PIX_FMT_GRAY8 && - ctx->pix_fmt != AV_PIX_FMT_GRAY16 && - ctx->pix_fmt != AV_PIX_FMT_RGB24 && - ctx->pix_fmt != AV_PIX_FMT_BGR24) { - av_log(ctx, AV_LOG_ERROR, - "Only grayscale and RGB24/BGR24 images are supported\n"); - return -1; - } return 0; }