From patchwork Mon Nov 21 01:07:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 39372 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp1833167pzb; Sun, 20 Nov 2022 17:07:46 -0800 (PST) X-Google-Smtp-Source: AA0mqf7xMG0AmBReN2y8uYrrlJEdBasDT8wbu519hDmyMnaVFKN5R+H0f6fAhaG1tkDPuRNX82NW X-Received: by 2002:a05:6402:370e:b0:464:fa1:9dc3 with SMTP id ek14-20020a056402370e00b004640fa19dc3mr9518181edb.343.1668992866208; Sun, 20 Nov 2022 17:07:46 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id sh18-20020a1709076e9200b007ae5fa9b603si8915231ejc.374.2022.11.20.17.07.45; Sun, 20 Nov 2022 17:07:46 -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=@outlook.com header.s=selector1 header.b=k4vKCTJA; 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 A93E968BCF2; Mon, 21 Nov 2022 03:07:28 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-AM0-obe.outbound.protection.outlook.com (mail-am0eur02olkn2059.outbound.protection.outlook.com [40.92.49.59]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4CEB568BCF0 for ; Mon, 21 Nov 2022 03:07:26 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=eA+85BF1IESzhwg/Ewac/FSuDBrzyC3/Tt1kASBCd6zjWy35N3JFxuTN/jgT9AP9ta4ihFMNUkvMjvNsxey+z5sNHHcF+uDjbF1tGsgTBBJO+FMT22orwAeTcZieo1teSYbZRJXQ46zrA9meW4oI5nplFTvKcf8NURgAmZzZA7IGWP/QPZTB79ghvaRz7hLVOEredvHpQ08iofW7LwEfIgQuXn9YaMhtRRjvyxxzE708XoNWS4XcEGv5poeUypy/kwWpzzXJcsPmBjEAL1MhpyABqP0ZlZh6m435Y1z40chiDB9qAlBC6AIsl9xtIHf9f8kOAtKhTDpzLCUlEqcBFQ== 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=rGUSgry9CxV81OV9VSSAdkxG7aFY52AVBWADbF+kk4g=; b=Zw3Ub083CPQhZx/buZijxX+2XXPsvCx9rxWjMwTSdqeQuuujn2bNzANNjOOeNhpYQ/S87mY/LyiZ2Q6lQBppuivP4SM4Km8H0veVBHiIYyzbKkGFsSsaKMLmZVNIisEHHictOiF5XNAC+JCOjyjJBkUPlTkM95fVuZQC30nJf2mpJvSoHa6uL3dnFgr+3sehpTJ98OzTZTl/+nSxxV7BI+SboIaUoXRO5MAxna2qfW7oOOAbAyPs5fy3UtT74VIcfioHHnPj8k4IYmVr9Xv83a0wHEJ854ctUVmTapq4yvcTyLqNuoko4E4bZgmg4FkjJCg7epu0G/J3KJ5szdyq/g== 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=rGUSgry9CxV81OV9VSSAdkxG7aFY52AVBWADbF+kk4g=; b=k4vKCTJA6Rp8p4IerTCGTC3bUww7qOOz4/nhMC79dI7VyFmD6B05H76y0Yz0M9v+Tp8/KsCV7chlfVuE/dbnLg3zyDoQFZAuzv8LHmTEE4i7p3axS0bjD09/xXuQ3ht86DN0FPmiuGemAew9gP3cWnHHqsSUm6/cFoLIOp+vcUYcfTud9Q5jwGlTOihe8CrtuRkVbSJxFvwVHO3w94H2fDiUpi6ZKcGhxxGCxAXdufRjGU+WBaXzqFRLF5IhDuBaOwc5rYNeFSlJUG0HHan3D5zn5rykIN+KA+QMXD9Nrw70QN4da7cnxSJlV7xjDqpTjKN32MwVRb0jHwPbeneMJA== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PRAP250MB0465.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:278::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5834.15; Mon, 21 Nov 2022 01:07:09 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::c37:cabe:316a:60b2]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::c37:cabe:316a:60b2%4]) with mapi id 15.20.5834.011; Mon, 21 Nov 2022 01:07:09 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 21 Nov 2022 02:07:16 +0100 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [vGvbMMG8aeiOIdT/5KFfY9K1m9SllLSBSAJnhx9sKg8=] X-ClientProxiedBy: FR0P281CA0075.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1e::10) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20221121010716.2131624-5-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PRAP250MB0465:EE_ X-MS-Office365-Filtering-Correlation-Id: 07bf8f56-52ff-4f14-641c-08dacb5cb71d X-MS-Exchange-SLBlob-MailProps: AZnQBsB9Xmo0aNP8rr9jcp/TekB2Cf+U/qOfQmyUDuwNqTfTfCuJ7N2sCgiZf9rpgRDKGAx1TlwN0/n7NcO1ByPzyz9ElQQ2QxQxba8exPZ/sesR6G69q9F7jLwbUBY0aZ1EzvkA9M7NWIOGhrmeUFbr0PctzgGbt4OS76+1Pd/jTCUFyWKY9yYE4lWlGow5rsSbZshVeCh51nfTOiXenihw0Pfvq/FK5/eSTCqYKxN7D9xJHTxxXRF2EMO00xK1S4Ui8sjGelbdtm0+AavgZp4MfscgyyGd7HiZkJ8Ro5FmhhphkCU2lohkmBtBtp8+YV1U4oB6VGd8cco3Ecii1sXM2/uxoKcex+u98XD0MfTb+kJvwtMW2FOua8M/2C81mm28J1rghfLXLVy4GV12XJtyY7ckPbDSwQ1fIGlu7U9OHoMEAvndizersY3ASsEhV59Z7sYge/Ty6aA/k27ChWrXXvzdxMWUOVfmbhlCwinuPAFAevi18Rc4xewWgWRYThpo6c9DsceBuNG/Pfj2Db7mut+l7w8XpHD79nrTsQqFjp8Z/qGcyJBBwlGDJIP3UFUTnrlQ7DPRSW8nZqmilL8hQyus3ttwsTOEVNLO4q1NnaninUH+kh6OLJEboVOTd59js2A6BEUXbulFaERthvNGCwsuYuvoT27z/g3ujhBlTLJQplYaDDe0IPjJgCjc8j3ikH6le+IA6K69p4T3e6LY7uoaQDdUMi+j8n0X6sUMHzSabdTkpwzPUQ8BnUgg5slHhTAU6Qo= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /T2zRZs04I2Wv68vDZuYuABZvS7n7d6wgQSUI99h9cIZhK4AXqP5DPRe3p5kyRxMlR+ebyK4yt92HOvVK7hC6/D+2KuDAFgohwYAbZZyZei2DIDTz9JerURpjR+FrWECSi1VzDDGZ6CU32FrW+rAiobuUqRalil5VlGSL+1MPu43zGTifheUsba3B+LSZFb++aO/ys2lVQ6Ae55Gz+4jYYeeyN1aPeWjOCKFHq3krzTZvkSxAwElwRs32ev3b3zRJGJsep7K8T+UXTENs2MCVXpG9wsKW60ZtKvUyDoMscNwkl3949x31m94x4UWpsi3ghICTCvoiauwr08kSn8tymIs+eXSCO9ZmETppe8tlp+fw+mxKckAuYNZvY2KnDyXIaVASvKOKs+EeZwF5PUCD6uPVQ/O4Z8/gGg6vWRujs9IqtM6kDuWDpymOtp32/oEb+SQSnsstbrZRWlOzWphhdn1O0KIxnahiK+OlwDzZTZHmXZmvvvdu8+2rK3LMN+LPRnQNczOLHnJPP3u2spbO+ZXbKqDQ+AHAm336YG45HcCBcBa5+vewP4G3r6S5dc9k31hIjSP/fHgGu++s27f56Bcn5F4EDv/o7UONxR87reFJOmiZpUhtnVVHhL5KUjkltbrw0koxrh6vhTa01cV1v3sQmOoaV4YHfGWS+t2tAE= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: RPT4MV2+436fy3wqbFWhRVm4giUIblWfga4IKvLUmBgi5RYN2I9X0c7fGUSNyeXNIUvOHj6OTRgL3tQa3aFdJ5NSEtm1nlkM1neWnA2X60s3rL86G3QP32OQZ/y3h3ygitONZQpvbrNIyME21Hwv5FO6JQ8aH1hjC1qGYNEla5dO9o6v31+xuZAoPxfkC4Z95JC7p2Msh5czzWWmD835njRi1FkZKleMJnGN9K/TVvgdoMLB3VasREX/NfUpaAWgDAl+vFR+NmWsdGRI9NFkzD8fnHgtS+cCOGrc6djC0/8HuZ5zXA6iYTTCp/YLn5hPdCxkvw2IuogWDyalD0IsWUvps+BMd46RjirQqD/Z9osw2ZlcDN19X8SIEIMeIPArPaVvSENoEMXWTUOXSHKSKjCxDvwWzwUCq6BiyBhcw7iiyxIg4MEDaD8MsnlRnzZNTtOyoJJHovm5CTgLZpqzdwoegTVpmWldizcgNnB9e3GNtjBhPzxGxuXyllu/FqeKWIWNwpAKHgWTgsgoOLwvMzvTqZMsKmPxXi/YamqRHu7TZA4iHpnpdIyaUgxG81ZPNojxaKgwStlzS1Cim+3C7kICpEwe7x+1SKZBzU15iu2BRdhAVdJmacMfrRR2h/DyI21bb/j3IQX1ZwsuOmWhRi3b5zvFOD6/aBU5rIhstBlcsRhej+RA+CcUK+s1vsWQXkT7dzi212XRUphYhCBbMhhlbeWuRV/4v6b21NktrOAIzxam5b5saSA+7PjMPFiilSvKQ5w4v4whGIBXylC8bS2bXSDkGRzvWdcuZfYpqOqlnvZaEFFy0mGAXlY4YErfzCCC3pMs31Cszv2C5fR7VemWmC2B1HDAyBHPDXw53/7QaF3x2p8/uW50xSy30EknNnMsGM0zQxQ8qIGeo8lSJwpBiOQfX2/3c44dYNSTUJaRWNmnrlwm46AgZUa+aFYbISeTrKK64lQMdDXocp70mfjqBq1o3Ak5VaP3ey26dVPoxJGY7FylynX1PzA56fL2Os/IqbfKwJht0JFx3/aHCqEF63Jkz+ChN5a1DZLKlEgBOyMOty3CH1nKkVnnq9EarF2E7sDAYcnDgoKcmfQ3lxXX0ZHuecudAhC+GAeDdrJt5NZCBKC/4uSUtQ52kD2K2w2KhCIhUDHNTRgoJ/KhkGO1eqHV2FmPzCioq2nUKbRGOTzqo09VZWS3Nmkqg6R801M9Mc1DWLSsS1zf0Bc9kvz2ZLFFNNhrCz8imnrlQDwT5vrgjf2zy3/1o8EaEn/6YFfIfY8XssFnFlhcSyZ+Ic7OteO2eJRFAWsvHdc6Bku57f7f4Bj3YDzB3mh4u5WI X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 07bf8f56-52ff-4f14-641c-08dacb5cb71d X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Nov 2022 01:07:09.7507 (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: PRAP250MB0465 Subject: [FFmpeg-devel] [PATCH v2 6/6] avcodec/flashsvenc: Remove unnecessary or unused variable 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: 0vUutIlftdWq Signed-off-by: Andreas Rheinhardt --- libavcodec/flashsvenc.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/libavcodec/flashsvenc.c b/libavcodec/flashsvenc.c index c4b16dff84..3a35876d9c 100644 --- a/libavcodec/flashsvenc.c +++ b/libavcodec/flashsvenc.c @@ -65,8 +65,6 @@ typedef struct FlashSVContext { AVBufferRef *prev_frame_buf; int image_width, image_height; unsigned packet_size; - int block_width, block_height; - int block_size; int last_key_frame; uint8_t tmpblock[3 * 256 * 256]; } FlashSVContext; @@ -204,7 +202,6 @@ static int flashsv_encode_frame(AVCodecContext *avctx, AVPacket *pkt, const AVFrame *pict, int *got_packet) { FlashSVContext * const s = avctx->priv_data; - const AVFrame * const p = pict; const uint8_t *prev_frame = s->previous_frame; int res; int I_frame = 0; @@ -226,7 +223,8 @@ static int flashsv_encode_frame(AVCodecContext *avctx, AVPacket *pkt, if (res < 0) return res; - pkt->size = encode_bitstream(s, p, pkt->data, pkt->size, opt_w * 16, opt_h * 16, + pkt->size = encode_bitstream(s, pict, pkt->data, pkt->size, + opt_w * 16, opt_h * 16, prev_frame, &I_frame); //mark the frame type so the muxer can mux it correctly