From patchwork Sun Jul 16 14:49:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 42764 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6da1:b0:131:a7d0:bc6d with SMTP id gl33csp4874434pzb; Sun, 16 Jul 2023 07:48:15 -0700 (PDT) X-Google-Smtp-Source: APBJJlG5+DKVBJ2dGhSqiZEvzFzzPyRk/o4ogzbrREPLCZZqwuIaikqaCPbx1Y8blRWW1dJnOuIi X-Received: by 2002:a05:6512:1320:b0:4f8:7803:64e6 with SMTP id x32-20020a056512132000b004f8780364e6mr5881337lfu.41.1689518895576; Sun, 16 Jul 2023 07:48:15 -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 g23-20020a056402181700b005187aee0b5esi5998034edy.396.2023.07.16.07.48.15; Sun, 16 Jul 2023 07:48:15 -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=BX6+vbil; 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 6AFD768C643; Sun, 16 Jul 2023 17:48:12 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-DB5-obe.outbound.protection.outlook.com (mail-db5eur02olkn2024.outbound.protection.outlook.com [40.92.50.24]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 83EE668C2EC for ; Sun, 16 Jul 2023 17:48:05 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WBz5axq5mo+96VnWAarHm9C4YND8Ik27jEEOgiJZLqPuwLBarbwvhRjWKCTFhgzPqtpEl/99/adi0QYI1UFhDrliq0v8c0PWI7uPulusYFBHRwhQ0EOB+WR2x/nRtnQMFdHNI9LLMTewdF+iLyuu/U1EZeIBk+RsuKHFjBFC2SQb5zYIwwbsej8WQCpkbe3i2rA/4H2qCASF/R+nf9lEFuT/qQvbM5GmZ/v1LcDgDwce5vV6D05M2NszUnL6Ufxop7wWxpFpdXMffBptlNWaefgqnDGz9FJsYpbfqoI+VDg+FlGzIM/Yg/QP2Ab/VLjDWG07mXyWqekMx+/gShz1TA== 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=1NxUpjBie3GGQ7uc+KGwYBYDsb1uyvA36XIyQDGb3io=; b=ACAMlp7IUT8AP+fL7J93kJ8JH5p91Z8+LERz3psQSpUMe/E8mPxC68EpvTUw+rZkfKC3maE13TVZncYBvRDck8A55wYN5za3VZ88gnP4o1rO1oliELz6JlNY6FNUMxBplAr9F4mnHhYrziLjSwKHJ+rLqMqQZD3knH7OBKnkOcLoUXYB+eSIujJvRlcUimm426t3QIxrsBXGQ6jwky3qKciXi7v/5f0z6hiQd7zfF9UWaEBgP9MkjnPCYa636Hwq9QxfZIDae9EfMhuNVLR/yTmIuEIPJRjiRh37RKNZ8rrRU6fJgbgaGmA+RrmjgANrM72zvc2NCrT3NcHaKCNTrQ== 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=1NxUpjBie3GGQ7uc+KGwYBYDsb1uyvA36XIyQDGb3io=; b=BX6+vbilLWcBChLmkoS7I7KJI0eg6ldCMdm+uAYIoMdEtiynYMziLeXY4dNt7pNa8LqgIhkQcawMTuCDFPH7HDvc+tfKIOw0vqDy1i3/6tS2ssNv+A3dPlFuX050+JyAcGJPLLv4Iby2eXR4wF+yJ865GwFcmUYhiex1Rex0Az2Oif+nPwLDW7inbeA7pOIwmVNT6u7cyZAmc/5+LEeaYSkLjZ2T7rHtjWPaDaUm6p7BiA6+J/zMzHJBlDxM5mQ9WjxyISfdiF/paeXdbkhgILEcqyqitFsjdcVB71BSHbP35MFju6GtRZ9sJ02nh/3jqhgGO4C1shyb5N9tSeUSEg== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by PR3P250MB0385.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:17c::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6588.31; Sun, 16 Jul 2023 14:48:03 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::7ae2:75ad:dea0:86f8]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::7ae2:75ad:dea0:86f8%4]) with mapi id 15.20.6588.028; Sun, 16 Jul 2023 14:48:03 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 16 Jul 2023 16:49:05 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 X-TMN: [sgD+qAm1N3O3bzjIv5AWooGDfFJJ0PdY] X-ClientProxiedBy: FR0P281CA0001.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:15::6) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20230716144908.4185726-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|PR3P250MB0385:EE_ X-MS-Office365-Filtering-Correlation-Id: 0f19c316-ab5a-4e77-19ef-08db860ba8a6 X-MS-Exchange-SLBlob-MailProps: znQPCv1HvwXGRChVmSx2Bzenev/7MsHrllGhD0nIjlNCpZ2SJEiTE7OjJSwrK4GvH/3b/Q0rQ1weroTyr+3jkEMxKuDdLN7OGSlZFUxXjzh5Oxd68ViphmJ9xGDxToz6DDcm2lCUt/+02O4WjFSBD1ys1wLPhXeILxYpZx0AQfiM/S0koP885TQ7rTvq3wnBCNZlR+h6KfJC2xLJr77neXVGGJU14Gor5/MVO3YUovErsYAPdrjxaDObaPrikBpGOfZpNHrcqPWIHGgxtCTdP/RqeQPw56cKrrxmJswYeBwjYFxtSCBODDoyhD/2Xvj0PC0qUBuJUsFOf5h42fARCyzkLLGevgUXZSvEv4aczxF9pLnxI864k++eZBWUavPXY0ExDjmGOYdHvEPbBmOSnc/1GTLlUvzH88KpILCU48lktcC8qDBl28vTHbAOYZs8SkWIL+G5V/eZxRygMN7h+6wcLZc+1Uy0H538Qb/IkrbzN6f5hl3lU8o5esP7MI2hgVPNBpn7e7tFkWP67vIEd6aiCfen0+15ChSlRc3fxK6iGOHikMWL6I6KI/yXNl6i2gI8ewXhiutbAA11eWdkaZwaBvq8wR19f2QdRMuvEpqCFRH16cwG0WKYt39sPe+Wm4wyvLqvILvJTDiVyi/sHqzlcs31slmBBKGlvwibQ1YaWWpWJfaDCtyH3aH5xv+xk2/TvUI2T20c8kPHd/wowW2yrICWG/NLJJJHxn90L2WGDtrkO42u/hOvKWqOxeum+ctSNoN5G+Y= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: eiMzVls8jtWIM9t52WO+CLvIyWDowRekKGIRthpIjr2RFh0rtC3marY9FMLAttrY/GlyR+sv+vL+eGfM6UoCXjFKG21EhcDKIDgfknhDpEPsKpF1Co0chLuM43xQxXiXSueFwTJpkKMbtBehiWHzj0Tk+wbAFnRGPTcSSGsFrw958L95O/nRZD/Yz88uBVjgU96dybJaWZAuc61IVpMdX7SpFXswmjIm224R8GA4Fc2Ohn5n3UH/KHBLkShIDkTaNd1tHMTBbjPS9eSLq5aSdHh7XxloYrrYwkoGZonYv3FT71RuXMBDDSFA0JrrR9gYO1Cn4EpEaPJO/ZXsoKstaFTuksGtohTlRh60qKKjSBQ2LQvMzxHf6GiOEMtzkC/1k5r1Qx07QiwWMKIw5PWfKVhG0Mwz34bGbcpVKlVp60gtJXWATJe7aiwbKXhN61S4rT/Y3mkNvYQFl9/dDebt3aCfCQBxqUcNOfalcMSybN5Ddeux7q1gXi/820xH62VJsqoURkJ1tdLHaLT3K/WJc/3MLnhDleHLBCtfPg7Sz5X9HA+AMoIMPZoF0smFzyMgLM5jktoYb3VlgGF9OiCL6f0D8/5uSfSUghFY8C/a1yOWHrv9FAXiD0FyN6LOqe9A X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: E+B/8kBjapzGJl5eIWwHeyj3J8zuJZtG0ykGiiDmvrczhBBxxEOaayUqqqxlJ0c1/7wIN0fZWwtXs/KM28PcZFFPWU8K35g2HijLuCEzfXh8/jrdm5w94KqyCkfl4nKUaBMWDha4on1RkomO5p616NUoIyhJ0yKUkc0PVu+27gciBxrhfdwGu4YEXlJvWNBg2m/Qp+BJF5pC36fv2NjRPDShQkpQnqjQSXx81YDNgl8NSX4/XwMoWYK9zH65Gmm0UvhHVZ9ZTSjxqTn7ljeLzAxV6kGkX9l3fztIIK4yX97uVQ++2NXIUNvRC8nLP2TPdo7pMc/Q+5cvkpq8FFPtRxFy/jxTtAWL9kF2tedIIQtbpwyreqqSr6kPjJngaZk60COefgQhWX8E3Ttx2uuQwR/5mt42QvmSK9GAOHkXYEdXy9TN3maWuQ24E72t3O2wjNcIid26jBn1GMo6AmXhBffMSYXqRcav83mgkmym4+Uj87R771WsYuTSAyLdWbbfzMqNvs9NTAo5sBK1cqs1d1IIpmao9SeEpG+F+iei2UZsj5CLzrxUlQGNkrucTIYUiTv0Ci4xvKf7y2PDhfIXh9Vns3Rmvx+iHMGhQnWwMvatOZgmWiUJczfrMvIi5j6vkwsIn/Wgx4Yig/3WTJqF+AZCPxRzruJLUnfmZDjXtm6U+sur3gFg5M+93aeWt0gfnoqC/oRGueVu0cx0RfJz9wvgaYgc6a9C9NRTz1/fksJ9Ib7btmSakvKYnYoLbZyEFO5FgUF36knA8q0q0w9Rn0X/T/b7Iam8W1UkMT13kZd+vjDgi7dIQrgDDXEm+0Ye2ZLhKUe4NCcu1rCPpzdKqrifvvT3+dLhXRCcXnBC77IEgx3UXsEWmefDz0lcQADj7D943mnNrJBA+qMlhRKde6F9E0a/XjgnJsSA6Sf1XFGKwxACXGcCa3+mUyWf24RVY3wwH/gVH0sxcDOiACx9FCt4mIFfCsuEr4Sd82ws0e8V7WuoNDUHl55EaLkkMuV2R/6EA72WtSqaWt89O4I2DbMJncBzOIKU5BasI2y7ITSduEAJXtDn7ll7+XVb5jJ6naCHkmbsrJKWdmp6it4raGA+uCgpwy3/7cfmjnR9AObUO0MuoY4v7eVD2W6UWegVqUKUPcmrlSwSVptVwdiCjo97a6llT/i7vm8m4wnne9TcW0DK7YaZoSVZ6LoUWFTTUMG6C085LVNzKoTf/V91V3V8c7jRVHlR+f9t3gBFk62gNwCmbDA2YVV/0if7DYh5 X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0f19c316-ab5a-4e77-19ef-08db860ba8a6 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Jul 2023 14:48:03.8329 (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: PR3P250MB0385 Subject: [FFmpeg-devel] [PATCH 1/4] avcodec/msrleenc: Replace stray \r by \n 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: 88uqKsVitDGZ Signed-off-by: Andreas Rheinhardt --- libavcodec/msrleenc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) const AVFrame *pict, int *got_packet) diff --git a/libavcodec/msrleenc.c b/libavcodec/msrleenc.c index b73aa5e384..e48d11a0f7 100644 --- a/libavcodec/msrleenc.c +++ b/libavcodec/msrleenc.c @@ -234,7 +234,8 @@ static int encode(AVCodecContext *avctx, AVPacket *pkt, } bytestream_put_be16(&data, 0x0001); // end of bitmap pkt->size = data - pkt->data; - return 0; } + return 0; +} static int msrle_encode_frame(AVCodecContext *avctx, AVPacket *pkt, From patchwork Sun Jul 16 14:51:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 42765 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6da1:b0:131:a7d0:bc6d with SMTP id gl33csp4875163pzb; Sun, 16 Jul 2023 07:50:30 -0700 (PDT) X-Google-Smtp-Source: APBJJlGoiwzZkhPgcVJyy/Sm1xeBWs0GLzyWKIDbqaK+Z9BMVCIjOl3oT9EO7nOgopaAi+UwxOcp X-Received: by 2002:a17:906:2d6:b0:970:c9f:2db6 with SMTP id 22-20020a17090602d600b009700c9f2db6mr9389941ejk.63.1689519030346; Sun, 16 Jul 2023 07:50:30 -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 ks10-20020a170906f84a00b00989027eb30bsi12624095ejb.610.2023.07.16.07.50.29; Sun, 16 Jul 2023 07:50:30 -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=uPzYEpcB; 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 92F0668C32F; Sun, 16 Jul 2023 17:50:27 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-AM7-obe.outbound.protection.outlook.com (mail-am7eur03olkn2052.outbound.protection.outlook.com [40.92.59.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4723D68C417 for ; Sun, 16 Jul 2023 17:50:20 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PcP1heYVuLzPUaw306bjpNMdT/h8JZ0hG99jdYN+Kf8QtnCRTatDq9y2qT1B9JPQHqvR6dUaKAOMIhwYnX9NMo5iOMLSwm2HIsB2kjlIolBXXsR2c+TCb8lT1uRsbk1ME7QZ0H0dTi572KoquuvoE/8EQC+/4HeYZn5OTdZ3N3UCEh+ANRu2XqLC1+qyPjuJDUHTtx+m27rKDq1RxbWaNizH4nilSt4iaC9FKE2arw5McF31IhQzYZDyUesDrON+aPqnKbAjKLsl3t0l4joJrxNj2eZW8vx5KZGc32Mh4sttENsHq7kfQCzbPxzyWsAfpb3g4TUubDT+RKLWHLrO1Q== 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=FTB8sS4NthTR/FoPP7uWrz06BBzn7+pitiHzG8rwjJw=; b=XgCAU3gpxKrAEkfcDeHs4sBRrA+RpZhstC5HdmW80xA8VJsh4/Nb4usACCKsEwmjOOJ91vBeXQ1bdxgoJKPyjo76VhwTP8IudbJJKwiSXH+dN/C2n95Qo6WCAFpEh5eD8EwGwIL+XQ1drigCEa+nDKFdHei1l0UTbIuNVVpDIhyDL79AUMxH02xfUWsmuNSVhqP1UG+gRNfI9uTeogeJvpO+IrmjpunPIyHhEnwVWVdTka3S9BiXrIifygT5NZDhuv2FjBNtJhNcYxFDifshGJuUHxUVkhNsaoqJ7jOZ9sDyXtyJpiIi4uzD1GlhT1SX47BdtPkGamdGLxxuRNALqw== 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=FTB8sS4NthTR/FoPP7uWrz06BBzn7+pitiHzG8rwjJw=; b=uPzYEpcB0OSIkVtWUHVLjEiKksb9SdfmxQ+7KYoWNwFFjtorFYJXBxOvCiWKyUw1AWeLq8YBS6PgX4ms3atC+PgF0tSjOBNMdChHCxUJacS8ZtK6Y34vd0fqEKHOjMKAYqPNH5HdfcwkdHLhgxZMMXgU00el2KpZtgoKInu91rgLM0O3eYjbrcY3m9wsRkGReyu1OD+iiZOnDyA/zhzCVyIg8FJhImNXDKRHrGJjOWQplGRE5u73NZOf9z4Hv1yhePCsighGvYmJtbGqy9eiaLXJEp2yVUJ8nbTPGxtEr53OZHH6AWWz/PVQfjZZCfdtEymDVva2PBsPzt8CccLeqg== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by PR3P250MB0385.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:17c::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6588.31; Sun, 16 Jul 2023 14:50:19 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::7ae2:75ad:dea0:86f8]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::7ae2:75ad:dea0:86f8%4]) with mapi id 15.20.6588.028; Sun, 16 Jul 2023 14:50:18 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 16 Jul 2023 16:51:20 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [EYj915LzPvXPCB6HdGOklT/2X0M7IZGM] X-ClientProxiedBy: FR0P281CA0081.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1e::7) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20230716145122.4185953-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|PR3P250MB0385:EE_ X-MS-Office365-Filtering-Correlation-Id: c138257b-1a19-472b-305d-08db860bf92f X-MS-Exchange-SLBlob-MailProps: Vs63Iqe4sQmNqaaQY+HdTyQKiZ5F01BKyzmAR2yYBpi7wsyC2C4E9oYPZhCDfUERxMPlzGqkO0ogFFpBv5J+ZwLa8NLoVjdRnYzsiMhh8D7RI8GhJgxaQ5lihgVHVHoEr+a9W0OyWsXCiu1JOTUiDzJKRj40bz4K/hDmZS2yJVx6QizHlJI7nBbl0Ck1LZA8E63iyitaTTw1L7ZOXXAUuWT4sFVHTTildrxofbnVFoJ1jn+RNPh9j/GFolDp67kmRg7Jp6MiS8WMfGkncCKQsekgidyqz0ywVRGfwYnP0eN0Te3Vp1/Lt+7/4ffJ/N4sXNcZwzSyFyRtgiwgnwFhemSxgTtwLFK1NXAtQMfkVbe0gyys+7ONoE5BUyssG54a8acEwXksoAGtajOrozJ8iV8z8sbxHr2ntLZB3lQPahQmCuwMFVxldLXGlAE3gXvB/bssRheKeSpst9iK7QbjSbPXeuyawg+xRkdArT4tj8MktMd0Rb5XWkcqoRMRj5HI9zSWWucrtKvPsS5BL6paWkS6AF/77S1y3pjaWLRckZFK/zwY4OnlB6UMoJuqmD/zeyHT0/ZvsPfNpGHzsEL3CyKPVGdCdS9DWbi4Qf9b4JR4467D+WJWTwTno2oN1kTZHgh+sEeucAKBKLyK/7Zwg4col95ctibxK1yCPyV1tW3CauT6Fo0EG+UdopfTJjj5WybIjlqQJ8cPHJwMRk67AiHuQAVgxf4ALubIwxDmbCc= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 3zu4LSR5HTw5XSr/LiqDcwsh/Qu7Pt5pOcssSyegPzz23u2YnV5DYt3u9nvNwEOUdFTX++V5mdo8c3d/ouOJX4YoHSra+NNrDOdJTmTAJLMblu5nFfrHYb6QSazYjti5GhxFHL4ytfBgJsIarIW+2WbiOhahRFuBxIsnd2QIBJg8ekhfQ7JyLG/zNFppiIaCGhGlxvjs62/XaqAuf7unslKW8JUwfdjfPDMzUrLoqwdvqimi89Tm5NikV9XkdSWDz2bSxpS22R73cqsyNA/wKbsxVouJGadRUhnKdve8OJ8KF/RQFvzUDkAzVDyYJ52p5jYgAjI5wkxHYcBr1sn1jwRh6qwQJn8FvmAfQfnGG98J+ycCGLOaTG3n5EtfhMAtLhpU9ZIEoOc3EE5cy5D1las8/Zrc2K7IPGm9bvd4gArjxNFQlVAcsgbjgSITzCVGWl0KVe2+Myqey4g2iORBh8jGZfRdG+oRV1TVOqJwSZFzhwSCqnWCbzm7+SSE1qu0BVt2DQtscNn/WNUnklVGop/u7Sh4LpEAfM32CYs/pb8E1PYWwQQ0QVmCPdZTCFDv13Lh/0NPl4/tmj+Sl+Op7Yx2EUXq6lBKtV2kzsGyBxcwJVe5HkHDwzLdeUn3h9Jm X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: xOzPaY6F0STEFxT8ObjbHCv8sJjpSBSrWS71V77/KFRgKRyW5iX6gfDekl7nDO9KISNRr9JA+/ktrI0fChyAhDGxTgKxHrgHncLnXuXvq/Jddrxya95jM4aqYK4DFcKreh6lfLhi0wmex3h2gX8AMzWcTFY3ABcIrtStI/BQE3z/Jvv24r7jfmU7oq0iA4B50mjqJWGEDqUurok3IKpO6hwvr4xbGTBepjouYSIkJv/BBp2blAbHhMxHCJJ1JZw9QkmBkHLUWG2YOCNC77qrBNgMiWNfP4raTfQ7/lUFS8AF9l9Ly8Kn8RduU74ZSJt+6B+QvkdNGQEr8GMG+DfSpgUdyYO9Ji3P12pjFeUDeE7u5xxtWFsSjtE0l2RAJtL3jtrp7pVpaJ7S2cfdDqpEiUAEFgkbOv3XrL6yPK1UJ5JE35Ba2VOB6XFpbNrNibnLixzBSPkYL7iD1CxDVk0sM4477ziF1ePGgWigPiYXLH80N1jPZnlggU59cR4zps3FE6hf6q3mEb8ApmOCokJiKgiiFavVh8Ynqtz420YVGUiFLfDYMQUiPABhSjO93dkctJhc8FFrCmCFVDbMQ/QpvOXMdFQDK5EL0dMbKtbSUHbtA9LYNJvE+ahrKaeP3JeskTW3upc7QQKhN6lvI4lEyoRZZZqvrD6rf4s8Zt4wuvjcdTt54u+w0Qe15zFVVVEAIN1ypdoP7CPcPMW2HW1eEqQzQKexFq82x0h4qivW51n+y0daDJDTwaZI/Xla+RM302bCJL0a0dXijAiNbuFTqQ2BWON4a/piMsJhxM9caE/abEB2lsCLeih+Ypu7XDMNC/e2UryIsg8MnqLrnYcz3l83n7kaIsvlS6MfIFF6yvRk/9YK7lth7Dv8TCnMVx2Vka6gVeZpgaCvqAyWxq1fS23vAB1fJGQ+nHgnMfA7AT3TZIA2Kf/LcNwUR/idEskUlqMQXO3MiOztBlBjGdkDES6ACqSUWPkJPTtFufAUNtcSMR8csRyRqWIsi3WV2pP1QjvVXxVnUdNOhjblDIzJnHBvd2GYfeQqJNA6UTbIyevWFyOd1H18L4RboHstiAUb40xvR2dYwE4u8XZBCpvTyfyvvjy7v27lNp9L5F7H/b1KFHe3CLVxfg0uY+ubeJ1FjhSX0w252NfeXEsr3ni1P0G5thBfqKFOEnm3Swil3Z2x6ZRPMBJvQo4Y6C4vc1cIwUL1EGB5EiU9h07ZmBHdq54WaJTMSmznJ97VfUh+RZ+W2zfj12DFkGENHoWcImra X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: c138257b-1a19-472b-305d-08db860bf92f X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Jul 2023 14:50:18.9267 (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: PR3P250MB0385 Subject: [FFmpeg-devel] [PATCH 2/4] avcodec/msrleenc: Check allocation 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: dSOdWb2ERH5o Fixes Coverity issue #1538297. Signed-off-by: Andreas Rheinhardt --- libavcodec/msrleenc.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/msrleenc.c b/libavcodec/msrleenc.c index e48d11a0f7..264d57e178 100644 --- a/libavcodec/msrleenc.c +++ b/libavcodec/msrleenc.c @@ -250,6 +250,8 @@ static int msrle_encode_frame(AVCodecContext *avctx, AVPacket *pkt, if (pict->data[1]) { uint8_t *side_data = av_packet_new_side_data(pkt, AV_PKT_DATA_PALETTE, AVPALETTE_SIZE); + if (!side_data) + return AVERROR(ENOMEM); memcpy(side_data, pict->data[1], AVPALETTE_SIZE); } From patchwork Sun Jul 16 14:51:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 42766 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6da1:b0:131:a7d0:bc6d with SMTP id gl33csp4875230pzb; Sun, 16 Jul 2023 07:50:38 -0700 (PDT) X-Google-Smtp-Source: APBJJlGIh9i/oA2VaADTGGedlgq8NPbwcfIFszPA79UU8sSYCpX3JPGMSxHG1owXZA05+fY+Q2wX X-Received: by 2002:a05:6402:b27:b0:51d:9399:4707 with SMTP id bo7-20020a0564020b2700b0051d93994707mr8759631edb.26.1689519037902; Sun, 16 Jul 2023 07:50:37 -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 j16-20020aa7de90000000b005217a64b82esi2196963edv.642.2023.07.16.07.50.37; Sun, 16 Jul 2023 07:50:37 -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="to8iptN/"; 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 91A9D68C675; Sun, 16 Jul 2023 17:50:34 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-AM7-obe.outbound.protection.outlook.com (mail-am7eur03olkn2078.outbound.protection.outlook.com [40.92.59.78]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1DAF668C67E for ; Sun, 16 Jul 2023 17:50:28 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=emIFduzxsO9nkEoXpCMcz5tqGHyU5WQgpY5vJpMDBwErVLyV2DXt91BC7jCNDTx+2xbhnmzl2kgjMYrYLuD2lI7sUHOT661quqNKmJtBEV6g6pV1mLONOV6ckpdj/D1132uIsubXtWz8r88ZRgB7cTKM5RMTvLJkSkgqnwD3/Zw/7D3erMRBP69sLG3vqqC4zfLban4kSLVq9ffyJczsYqM9a07LOb+mOKft/wLQ7CcBFr0QV1h2DmUdplZT15V/82Q8z9Yo6hoLOjPaLiWkacHIp0QKHqUWepByRBrWwL/7l8b38FfAa1efLEqVK0jXCz4/7mk6eIXyFoKB9vpuNQ== 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=qhSoOeoFkGM4cxgHDB/H+cnpn10CcuTSjYq9iENC0QA=; b=c3qwwmwbXhNewgd/Hu/Aumo3RM/5Q9caHeYqWrxQ0gLskwxDcogEN6yFIaGBlm2Sg0+MxfNTWLThbJeyailz4drJlkBwodDmbknrDrRfwhPPpQhmVrq9p+CUxJiWMELA2/bcfwyl4Nz7VPY3x1Ix1WDtNgCjgVRCAXx6VO27MQCGUxTlqzUhFuz/YbDtZLssBXMON/Pd3vJ5Jks/hAyNHAiC9AtH74oKDkU7slUMinQTKAUS6fkFETPPJMuqywlke+loAGiWKCziXGBUX2fHvNjz6jr3V2rrlzm1Rx2IsF/ZN7tj0EoBtQevsImGeyiXMzid0xRnHyBK5/B66v8giw== 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=qhSoOeoFkGM4cxgHDB/H+cnpn10CcuTSjYq9iENC0QA=; b=to8iptN/JngUuJachII2BUGcmxvK9fcVVd6VbjTv2+jrizElQMNtvRu6Nl1bQ7+Lebq3dBMUyKWDslyvjEmhkGCQ0Dd+OTcG2L8WkCeYkK9EZCql6Roe025A9QQFlY4YSmiA5RYYMhOWGVe8U6dbSZusfKxa63jaTFuO8HATSZAnJLeWCmoeUP8RtR00iof3K8FdkH7cv8utoP3SuTqE0IlH7dWAsxe9/1wMeKYxzJ/DBmIs5qhBrGrWcKwVl7LoivWOmSJYeoi6mRtTRFlWQyLkv5PVbPqeZgp7MQONlD3o70+QacOrVEVgh1jGMGhnxAV/NCNHitsr818a5DZYaQ== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by PR3P250MB0385.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:17c::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6588.31; Sun, 16 Jul 2023 14:50:26 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::7ae2:75ad:dea0:86f8]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::7ae2:75ad:dea0:86f8%4]) with mapi id 15.20.6588.028; Sun, 16 Jul 2023 14:50:26 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 16 Jul 2023 16:51:21 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [GuZGM5emHGLVAoX6fH4UI7itdk2P2peK] X-ClientProxiedBy: FR0P281CA0081.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1e::7) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20230716145122.4185953-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|PR3P250MB0385:EE_ X-MS-Office365-Filtering-Correlation-Id: daf416f8-2dbd-4f1c-d434-08db860bfddb X-MS-Exchange-SLBlob-MailProps: EgT5Wr3QDKz4zPL+otEBjNYttkpcFUDpIGu7RXiliLqFVJMP7gxzvJotIBK4i0BpXTr2tQeS4QRYPxc5RmOj0EXGUmo3Hkjkww2V36dKIZmAQpswOQCd42OpDTL/Qtl9QWmGyNCUhzELAEYqJMMfGXrtVDAF/61ajuZTL6GZ014hPy7unHXxTw+oYh0mDTA8xI5GKrrKk+nWW1gIBTpGExWQ6eVTMmSb/52o9EM2559Q+KVRuhMI0cJVFA4nRdxn71nxKkw6wtQGD30yv7z0hlLfJsy+KxX5dJhK+xaWfN5JGgOjfqiUL/wB9KrzL8vQbyaN7X+h9D2bV1TvGGfRUjiYmVixJjnkZWUKk8mQzXDtaEqyVXmQg+S60DyDiS70fX+Vko/h3S7rMXAK2sW1405SM3e9kcTz3CTpZw2CiKmsxiAxhDqOs0jIkLvyCaafwTdfxWKK7YZIrpBXa8XJh9CfF8zM+K0mvXaFcwH3ltKe6kJHqbvp9J/5rAqgxq1lBRKsez0Nf855KxHL0Z/SGwrUTbnFs22QQhVz354vJhZv4I7hHohkp2PNPTO3L9LuLBzTp1iiHjIBcMDKyk1jYVv4CGM0JpEFytUpxSM5J4wUV6f2mgLEGmpG/MLOXJ6DLc2XzLiYNZwapdVjpDA8oo9ZzEd/xq9KvAqJlyynxTZXxxkrYYsXXZAsW9GYt4jUuQ+zgHf+K2NgFSYo7arLbBky1qBTrKh0vyWs6Dt5gtg= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 6NkDo01ADNzEW7I1Thlx8gM5IuYcahwFP7oj9XeAAd2QOT8GPH+fN3OdbGuXhH9ZjY75hBYdtrXMD/bH96K2a1GfVG268657myRNPwH6fvvRZW9NzGyjMlUJVwHcAlh76msaPs4EUN4SmgJtltZ4cF4q0psBS02pNCx+Jiv4n4hCggA8iVaLVxoPvU4NxTOHC9GPpEEKLyn20wRFcAi9mCMt+x4uhqghKCEqyHY7BCGnwfGHhlfJ9R1aly51ZfGRnUe8dnAur016QSr9FzN0FqgPzuIbnGfQDbC1lDnwztIHQpL8rRKaRZfqAZXtR6BTHL/Ub4oUSdrVARwZtlk0/z49xQl8F+khie3VVOi3fuf7L7lmHMC9wMn8ftUcnjCOOuQU8O52dnHDPVMiqLc4f1/5vcptM05iJDSuBl5sEV2SaftVVelGMiwMi75ruWIR48dD9dckG9l78Ykup+8rwSwXql3xDxQE6lTaeHLhzLb3Li87F1razdYRRNi6wEIhnvN+1CxMExRfsHfQ7i54G7YBp8g40u+xyf03mTODMSYCf440gUJ9CCb7eSY7EJLuFQfFtWyMP2HUa05uVg3IRDJmrhnNDyM0zLhyZecr9c5Gut+gnQgU3A1/LdpkqbJN X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: gTLFqsyky2FTOEl0p6cpDi78FSvTXborJ34zCIteGGbG4rkinsXpBw36FK5wEGqS7ToIVgHgXQhDMFEVWVnvjBCIdi/+XMETpd+0j/V+Dp6ulf/4qaJN1E4Lqs4x9sdRVNHI084AoPhAkdx60iK1zFeDdVk0BqaExqQlYxEvtuQyDCG0maQlZEHQ37SS3shC3IDVcXvgipwsziZwO9agyCbS5MRC4+yq+whlA/WetwlpgeEtbG+0FZo70ujGmnUWdDlrCVhkgSbkV86E/I/ukgSPGVkiqCNr52gfcViOOPcazCE5s7oFIenZOHXUK2kiuYOjmyIFUJMqZGEZtJ2agyvCLleakdEUsI7uGm9eRHtSvYzNwiAhPH0Wp3NWpL6NTOjp9AVRiBcYgI/FFoA6clu7hUbnuVVtzIuzqGIqBIPSAFmc6haMHHnLHqfUA0BIKO9hCYFFNEWitmkirdnXhsFFfBRKsusn/G0RMSs+ozTUocRFsKMrI9gSxebARu72u1ZclMgomIOt/1QAMEK/zHAVVUHzSXIPItcIpH8FGi3jcELj1Kjr4szEoo7BP3mUmU5udD/701vvO60e3wCXs8Kjaup43Gs66rXl3RYmXsNWslfeTh1fcuZmS4sVVWmnNF99/vI1kk7f+C0V05c2m7q5xDOpCkmk11/JiBJC/tYAtaCYDaOPlNQxSND1adkIYWgltLsiiEH/5B2Js3qL4nFLaLklYlgbFMCFhk1MGpTaZl9QLLikgGPnfxp+ayaQrE1lXRt6XhpjMFn0JNHZVmIbkm/mYzjpj/6fnjGf+r0LG9RPP1J5+AAX+ODQIXqW09WN3fcPPz6F1LOyvMTzgWGU+0o84uWFpMBx5SWAT+cQQ8jRdFuovwXdGZXBqwU7acn2f8e/5aXpwle20Vp6eO4sevWtDhVOsF2ysHkW8/T/19zZZ9zv9kqZuxtLyUtKSR/kpCTtUz9uNF0PJuShL2w8NspMHc72G4UugopCD/O9K+jzpZzfg4cdyAEXbnEzKIzr3YlCLi5lcUojkOOU7i5MxRbBy3MVPKqRVke1UJ2O0n7XQJrrE2N8yDmdnyZcFtJZCM1zltO8XO/aZJ9GGQo6+hDVwoUa0HO8ljNQb+iaMLEQv9nuV+4Tb0HB4jQ2HC/8MuIneEKSp84Ec4EqYPsSoWbnKiqwPAK2vep+NuS6tZ8ciGdb+Fv+DRGxlXrSPuIkXE1QlrDBWHz34VeiHXfenHQyOngqKROKkxd6aCcyO9dKt8YuUyX8Fuo7gZOH X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: daf416f8-2dbd-4f1c-d434-08db860bfddb X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Jul 2023 14:50:26.7575 (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: PR3P250MB0385 Subject: [FFmpeg-devel] [PATCH 3/4] avcodec/msrleenc: Remove useless private class 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: NZO5VDdtoR+/ A private class for an encoder without options is useless. Signed-off-by: Andreas Rheinhardt --- libavcodec/msrleenc.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/libavcodec/msrleenc.c b/libavcodec/msrleenc.c index 264d57e178..d5931f42fe 100644 --- a/libavcodec/msrleenc.c +++ b/libavcodec/msrleenc.c @@ -31,7 +31,6 @@ #include "encode.h" typedef struct MSRLEContext { - const AVClass *class; int curframe; AVFrame *last_frame; } MSRLEContext; @@ -282,12 +281,6 @@ static int msrle_encode_close(AVCodecContext *avctx) return 0; } -static const AVClass msrle_class = { - .class_name = "Microsoft RLE encoder", - .item_name = av_default_item_name, - .version = LIBAVUTIL_VERSION_INT, -}; - const FFCodec ff_msrle_encoder = { .p.name = "msrle", CODEC_LONG_NAME("Microsoft RLE"), @@ -301,6 +294,5 @@ const FFCodec ff_msrle_encoder = { .p.pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_PAL8, AV_PIX_FMT_NONE }, - .p.priv_class = &msrle_class, .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; From patchwork Sun Jul 16 14:51:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 42767 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6da1:b0:131:a7d0:bc6d with SMTP id gl33csp4875291pzb; Sun, 16 Jul 2023 07:50:46 -0700 (PDT) X-Google-Smtp-Source: APBJJlH9GWSM3gXw+x01uuehFv8V+BzIU8kOziXYqDnXrKG4Aq71eC51D8iiI58TXCR3TBbMqpMT X-Received: by 2002:adf:ce09:0:b0:313:eadf:b82d with SMTP id p9-20020adfce09000000b00313eadfb82dmr8349026wrn.69.1689519046182; Sun, 16 Jul 2023 07:50:46 -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 hb7-20020a170906b88700b009769ff4d234si12734429ejb.58.2023.07.16.07.50.45; Sun, 16 Jul 2023 07:50:46 -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=mHzvmEDl; 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 9C26468C643; Sun, 16 Jul 2023 17:50:39 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-AM7-obe.outbound.protection.outlook.com (mail-am7eur03olkn2078.outbound.protection.outlook.com [40.92.59.78]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 363FB68C685 for ; Sun, 16 Jul 2023 17:50:33 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PsJdfU9552KmhAT2D9vCcwUJgb2UuJGZAxe7XAoq7qhCfHhJpj870mcjoMIUjHefB8p+eCS585uChLL8n14AhMPBenDkyEAAUXpMbrX/AY+Lv5kA1aXKXWqubtZxP+V3XvmtqJbK8N3zSvCwSxCdajs4Rz1TeE/sbngbzmd8Xob6rYSAimIXx4IF5bQU4MHJkUQaOl/9mQIt0UlBJSVeZuiVlNEo4SmYODRjmg1k4vTY3/T7lLrp24mG0nk0sUk1Jv+rSas2lxEjACje4d+U/hy6IeOcwsD2DxFnAm1hBe99O0ujOM2KHKPFlMwOz/U2NiJPRnxVOeXQdo4P71uZjg== 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=+pIMbySxAiMo0gaXkiB13j+oYea2z9m6YOEruRtl3w8=; b=evF3nG3mpxlN+T374fwv62VFm0GkHhdu4H042lm6QQwjut4e9xwQ4g1gNrI2HWRCHzs996sEJLkVEL4mcIwsZuOj+8PsHJhKCRzOzENmVOizJg/jmvE5ehyRuIoR/vh8eYld4EcYmq8+LA2xQ4nkUbeaCVdzPq2K96bCYSxgG6GVij/91mkt8zMmDyP+qoBtG6Aw/Xsx41MSf4I8l4TKruE/DqesumUndbyaoiYK6IGKV8khpVLABGPJPlYVSjanvtuH98SOq92m68KnEv8UcaS2C5pXC7zYmGPMGNrUG/7wJ4Uq31VcAou9M7o/MIBAF7VU1vxidD7SHKjaHKJ9jA== 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=+pIMbySxAiMo0gaXkiB13j+oYea2z9m6YOEruRtl3w8=; b=mHzvmEDlB8o7zSEqjT9/LU1A/crMuG22p9F7wVx/D1drjJmXgZqH5v6fZLpLKCJO8d9hEMRTFkXvxTSC/ag5B8F94n/IM9GOu2pFvo39Dc34gAFGLMfPB83pldV3EQlZ2DJtbMaMVyTesklRlXQ1NNjLn+ktO0we8OMwuYGjFA25O/+rAhRlDcYtLiOc0fhgrQrMDnWxx1NJWpdnhzV36wfzt9oW93TBb1EsJeOBP9lruD5ZwbhQyp7lo05CP9TnA6abyAU+NgU/zyPvzClQ/KF+EZQQMqSO++tv7TjQojA5UtMexTgxUfGbStfvdArShm9uxJNaUt+DUJ3T/acVtQ== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by PR3P250MB0385.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:17c::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6588.31; Sun, 16 Jul 2023 14:50:27 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::7ae2:75ad:dea0:86f8]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::7ae2:75ad:dea0:86f8%4]) with mapi id 15.20.6588.028; Sun, 16 Jul 2023 14:50:27 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 16 Jul 2023 16:51:22 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [q4UhQ+Bre5LKehctFvET6jjoWPGVDTI2] X-ClientProxiedBy: FR0P281CA0081.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1e::7) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20230716145122.4185953-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|PR3P250MB0385:EE_ X-MS-Office365-Filtering-Correlation-Id: 099e5787-3a79-4c60-b0ee-08db860bfe82 X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmrtEmGPpqLThyiwcQNaf4D/wdjFtM0z5Fw1pk3vITlwNEcVShwxpWu6zWvfyutHYOHhnLhXJpzRTbMaTJDbttepdsOogTuJo27nO2PC/fci/4sOzyBYhnW+Mzgng0WMUceQ9bqpgd7LOuWNW9sxoJEWl1Y3ahfdn/EUJT4YlwH6QYUafA0NecwGNrWz8CtwGHxQ6OqIlywl8i9c7qRz2uh1OKHsAdK/d6X62lCwINQvJ8NWHSAPM1t+LnESFSF6T0hQr7UOYeil593nRxglj7XBptvLwblw+nqSNdn9JNAbHy83j0ZOFUVKBYXexkr081eCp9DTAPD/+JxehfC90KhFw2dTiAcmAQErJoh9BcjhIeR3no9BtLGkeM/tXcqE1rnKZampmTOhhSJTd5zBjVlsObVuCHtv7DY2BhRfCpkiqLZRHv17S5n/xyJTySmZi02HzfyGeqRqoyryEmz+AiW8OoVVFKoGJ6rh6R396yxyID2Sw8E2DgWWgoIezbXa+1sEw6x+IJOx+Kt8meeQjHGexJAsB4TzlDArLAPkXhyyvn26s5IjdX4mtEER/7E262nmhwk18pu9c2aVOPiOTYwB5JSaodBkvHrwoinACfvMpnvYc4ZSFF+xlgUJ6NXAeBE5KURtjdm7te9tltSWy2I7IID8GrNhFZELlkhsn/yWCXveAsXCfu5tjMVBMJa0XgCe64JzX49QopNgwdbuI7Ht5TMHseqQC9nU5f5DCVeOPgoyFcjOsg+7GSk8+iz31CE= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: qqVVytUn27oKMRO/N7CnKkdTfvPS+Y9OMafXSerF0W8ZQgGVt0fnPr24ceUljwzwOpKAJSONAo+IulQw5+Il6a6qoVYdJfbg0pyIf88agX8BHx4k6miSGKm2V+qaQ4nWSiF6/EHtzh4ikrvo3oJmtR6OCUJ+2NoICzl+DmFYhGUbsoISPNJ+aSMvtnTkm5QKJhfQpCu8klNivHtq5tsEHo0uDG51qvuDF3V7Uj6TjpHsC3uExeWBBTPGW33yH0qQY8IIZN86vroag+o4+becvzYzZb1agyfKOJ0a7fu+Ue39XGGBxmLjjjlPHqLIl/XCDtlpYymRtzkSvz4xCVOoICFT1qiUtQ/gqijGnnZqDiT+lZMn43b6u/0swIq1dPm4gjfUyLCBdVTRF2ZnMuFfIJ1ArODLruSWXvTwal4JZMnyiZ8owRSRieaFKDzd2AdUVDQwkXsqRpjETYH4jac09rO38nEUseL6xYy4TAZokxqKiVBXy6tgygciInrvjV9IHOsassjaqeYAysZjKX17oLsYvvKjgh80wzbDYyY629BBKPlL3aPZywvp4yb7PAdPO0OYUv1ECq7BTxNCcXDXpKGyxzFo51ChhDUYNKqNC07YEQLB3TqZvuDsUvDWY5L+ X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: e8NT78Czn4VCIGoxj6SVbMY1WLx/CWdhhyQrQSTrSGLVdiT1fg14Dd/iOnGhZWm3wP6zwecmq66PHanSUiIWmM/z/xx6gXOfS4t38GXVbNXl91dNXizM4Z+X6l2yAKPuMi6vppx2P8AbPqzZ8jQr7rzN3vpsWpIzL7X37ZRbAG4e5P1EZdgT9UsMu3Nrf+LQuaD35YND6V8bn+XbiMaOrttML+wrRWrM/0REZBSHiUownx+J3+cYv9DzCc1WLT9JWb1uCT+gND1ymu3lWXLDDaAqkp8vNeLiF4JsQ+pXdIMALiTx8rGdotVIZ5S4yHZYfs2nPp+BjWH/f/Tdmqx0fd8RC1pwEiQ9o0CIYkHbMAVRtEbdBgIfJcD6E/buj51d8ppKT//faXzME9iRqtptyOozW1tzhziUIu2Du1rQIcPxhx8Pbr6ms3HSZB3tuePOZ9rfW3l0iDbgmspTDzwG9Ge+f2Wjfe/+Bm6QKIR9co0u6qyi7IxndSLuJw1gcfCxShsBzu9kbNrb4HNjmPnG9qftK1v6OSojnUzMTAOni46vgAU2k9zn0LNOeBSE/OFD9kZQpwpKsR5MpSjJf47zpGJbDIrtH+dwii16769ASd3rDaXQM+cNbV5nQXOixqO+/0j/VFQBO1Qkd+WlGqEN6qoNgxAQUCbzb4LAuQfXmtXaQvQaM8zZC/REf7Xt5JVgpOe1XuwSucAkrL+Dmqmc6rPYnQEjLjlnV0RxXLTcDAa/0DBLc+Cpm/tx9SlAhRmXT2hKiPigoSeA6kVK3ad/9ZYibhgIr+jvrzNKXoL25tcMYN9VwRX6AS+K6724MhNgujIPNexhhPT+ao3zYNgDmnJgMQIqbr3hyoTNHEsr3V9/s600JoRmmSD5e72LxPCkiUQYp6Lyk2y1dnOIy9xN5U9cEOfQgRdpbIBfJndQAw2oBCin0ihp9cZAypFoZYrRYbHYK/nPk+S6tuD4pB4ADclm4WnYh0GZOKtplHbTGVXTI9bG4lJKmS+VFZLonIRJgO2b/ahFS4caMiWdGsTtBp2i5kfQObAw6nOIbUGdN83B8hNEauG67Icl5ZMWTxxKjOIKCN3veiaj+sPiLdj5vyHvvwP21qPYM6ZEhgIJxy4mkH53SbkguiV45qKdH/j1SPx3tNRvQBwCsNDU5AbHOwZk8HoZQ0977HunBfaum6An8lnipWP9HFyEq1u/fN+DyCLpHDC/KZYO2VaUeiUtg95LYpFjbkcuJtaLX0w0+/bMRfLO0M1XshbmMM8ECwKs X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 099e5787-3a79-4c60-b0ee-08db860bfe82 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Jul 2023 14:50:27.8716 (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: PR3P250MB0385 Subject: [FFmpeg-devel] [PATCH 4/4] avcodec/msrleenc: Check frame allocations/references 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: 4ca3AEwFXvpu Also allocate the AVFrame during init and use av_frame_replace() to replace it later. Signed-off-by: Andreas Rheinhardt --- libavcodec/msrleenc.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/libavcodec/msrleenc.c b/libavcodec/msrleenc.c index d5931f42fe..11f7d2a319 100644 --- a/libavcodec/msrleenc.c +++ b/libavcodec/msrleenc.c @@ -37,7 +37,13 @@ typedef struct MSRLEContext { static av_cold int msrle_encode_init(AVCodecContext *avctx) { + MSRLEContext *s = avctx->priv_data; + avctx->bits_per_coded_sample = 8; + s->last_frame = av_frame_alloc(); + if (!s->last_frame) + return AVERROR(ENOMEM); + return 0; } @@ -265,13 +271,7 @@ static int msrle_encode_frame(AVCodecContext *avctx, AVPacket *pkt, s->curframe = 0; *got_packet = 1; - if (!s->last_frame) - s->last_frame = av_frame_alloc(); - else - av_frame_unref(s->last_frame); - - av_frame_ref(s->last_frame, pict); - return 0; + return av_frame_replace(s->last_frame, pict); } static int msrle_encode_close(AVCodecContext *avctx) From patchwork Sun Jul 16 15:01:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 42768 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6da1:b0:131:a7d0:bc6d with SMTP id gl33csp4879507pzb; Sun, 16 Jul 2023 08:01:20 -0700 (PDT) X-Google-Smtp-Source: APBJJlFsFc2IV76+Ca6xa2NoLbpQRqBtGNuzNnqHQlMQkRt17jvX0y4wHvLwZUemgjUhmEN2SEXW X-Received: by 2002:a50:ec87:0:b0:51d:98d1:5337 with SMTP id e7-20020a50ec87000000b0051d98d15337mr9265576edr.37.1689519680446; Sun, 16 Jul 2023 08:01:20 -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 p20-20020a056402075400b0051a59d81c45si12205631edy.18.2023.07.16.08.00.55; Sun, 16 Jul 2023 08:01:20 -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=AAR0v0q6; 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 90FD568C67E; Sun, 16 Jul 2023 18:00:52 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01olkn2082.outbound.protection.outlook.com [40.92.64.82]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 71D1768C366 for ; Sun, 16 Jul 2023 18:00:45 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=eRKADHxHbOrF3VG8ILFO/5hGJsQ3kcHIBUt6ErSyjDWfZ3UnaDcwZFM7V5mYfen0WIE8hxP2kAFy/i0L070I2++MBRAiJSpfhP1KiR36rfAnHlStFhkVhIyKfpk2W8bcL/3sDNFdCvErW5w3TqM+LSWQ44Q8943m5bJAq5VxvGFpVndFDtkYt7QjS+Q9+wqzwTRF7ARFKd6z31aXeee9lGHV3PVsANYaZN1vbb5kroCW/vqCfuE3WXLWM1SLRtHujcWDs9iEiiLaCgXf9umGekXTZp1TeFyZ8XfoZxTbLNO/qDNaXBxmm60WA5m5L5qnNVsI2/6ul9vhsHqAP0XZ2Q== 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=J9oN/LNux1SBQ1rZgUXeSMFt/hA8+KzPPIK/PEAwdXM=; b=f/0RpWeHzjyxBf6KVU02jiS4gmYNWcUshYE5eBxHz04LthcsoO/O6IJ7sfDBurGb3QprGS5JGFAQeYbAuL8Lp5nGISrYqNqf5/lw3r9kvcZSfgD+BM9BHpJ1gVDNRogRdt7tD3YqjCF27HU49Pq8z2WvhmBRvZcBi+S8R7onM0m43lnGVuFCZ7O+2M17s4Y21R+wweKjaoOTJA/54cUzzPa+SUxwoE+G1oqCUvx/KCRAhpatwzJ/Dno385Oq9/7cz7wDX4FO7C6tCEjZWSdA+e5VWTjUnq2Rbyq2vSZCLyrWxSXPMKX5Xnspjx7nI7TGferbFbqTLjE0uWZNMM3F0w== 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=J9oN/LNux1SBQ1rZgUXeSMFt/hA8+KzPPIK/PEAwdXM=; b=AAR0v0q6ozi0FjAL7vHVtAxSNNyulHmyZuGF5e9Yl4+ufIbuh1gkcvidJaVguLk+gzDYmZmVih192rZDv9T4yij6e3EBmFFaWOUnVvYIfJ+Iiq0E9A8d24CN6hwOJDmOfjlyVVqAF3GcjMEdqnhk+k7R3jBM/IFEtbX4RrR2BCA7BIHI3nNdlJNnevNzwwJYu5tLYevyE5YnuX7FhtP1Ytz+uLfaZ0kiVVIFAgEZX5jbN3l0tvaXikQVRoHWro5wtjxS022w+abDom6ooJdKHIaCthclSJbVcCRMqmXWlULrb2X55n3r0JyXeR/COkS5LrxcBX6pY02+VuiLQRVggw== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by PR3P250MB0385.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:17c::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6588.31; Sun, 16 Jul 2023 15:00:43 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::7ae2:75ad:dea0:86f8]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::7ae2:75ad:dea0:86f8%4]) with mapi id 15.20.6588.028; Sun, 16 Jul 2023 15:00:43 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 16 Jul 2023 17:01:46 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [FPGYntH7OcWxMomtpF+18foCgZAKhv4Y] X-ClientProxiedBy: FR3P281CA0210.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:a5::19) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20230716150146.4186389-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|PR3P250MB0385:EE_ X-MS-Office365-Filtering-Correlation-Id: fda47879-27e3-41f6-0464-08db860d6d5d X-MS-Exchange-SLBlob-MailProps: CLk2x5OX5VbPdP3d79/zYQOU3wEtehW8fy456XcbSakK0CWekVgS7L+0CtZNsaVuLW6jJpJx9emhAZzAyzsDNIp12eEyq6LUfpOKMfJ8iUBEteJIWgRoWN+J83lbR+0KoSu3g+bbj58ohd5O4vU+fCoYySMhRQQ78A+0Gg4y/QhaLT81HFKmRm5yOff6ORTHQRAi7oP3CKY3Yhq/2xMUeDBzn3iaqOlCGdV7a9ZT9iZR8H7gG+qzsVUSOBbeSkg2a6EqYDg4XyRf8daVKP6o8APx3dNlRhQBnVF/55u6Ugv0a+k6+pZaE8/TQnK7wHuTwm3G00K4aiDPUJgEKoPnTEloSNTIiynwXcP1FqOEbWRUkd/nIiO3MR6OO+AVCl19z3iy1Cd4WIg0FGDXNex4BVBXR/XZ0VrLIOR5mgN7Zz6FGhVewrosGRP7Z3uXJoAWcdJcsTOMUOrbM9k7uGeShPtBxVxwMSzqHuh7hWVDw7cepXgaJ1mqHLKkk45oonpEB4vuGu9mA+FLO5a7U1Cda2yr7Dw4a7d6QJRbntJpDejaWwxG0+VuujTIycvJt+xEPcC0+VNIZ4ZtMdpd6+NystM8T2pemLYngAULFJk1r5dCunsolNNWWXtmxwJGDoya8y6UMCnzGMW/RXX1gpT6J4YY+g8DrvGpXe9A3l2KpvLLpnKtnwrwBvPMCrT+TcixJBWUZI92bnK/+fC3o/rNYQ== X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Y1cqzzOy/D0Vdck3tiK1Nsna7v7hQTo5bt1x0KPWhd0VmGpiJf8lc5jpbAcS3DcuMZqEJeUthJezmOx/aBxQVR2Y3FkRHGb2sIi5GgbOxh3gUQxouSSnMetxOCwV/pmfxS8h5hobmw9fAmGaFOZWVGOGoFPeSYBiE5E0YzwFxmFgpX+3sMdphnH/Y6M7HikxCdZXifQUAcKfJZWrbjn/NFxTnCQcFMkIRLh0HCWpHB6d2SFGyzNUi4Yp1jVvpjdsH2i/fq7yaQGLkd6fU+bVLAxHcRJYP/5ZRpuCEKEbgT9UT98K746OBRANjx4PNX9r+X8NesmunX6RdpvF8/P/msIvKxGujyAbdCpcomO/2K6aeAv9+AauAHk85m6+8bAyoHX49rRmyzR5OIh08YxJqkh7kh06Q/N7cXGf6kNeHR8zAl/Kezc1zi2RBakIKiCsfM/Phd4UF3eCZZxVgwmvq6BvefdF6WBjKaM9QF9fbmMt/OJsumAuJIUxRe64lBBawF6e/jfgN0e0ZgauxmGr+D6WpvkkpL0HEMZBc+HuxcKckx1hNAJmwXjMSursC4nQ2RFAwbul+aIHInc/a2AtEQQ9U1+JUWfCyWT29kM+wYS6hSWqlWl3avRH/pYP0lCj X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: NotijUOphZRVvn73ozY5sFspVQnuWNb8nh9iqa5otsuDkb4AwSz5UFPZfXZbOSXoevbkxZdeSO1jCoAiw7rPzV8bTOUD0iLdoQyGbo6v7veZS+Teu0QiCmlSqzlBcCMPFgLPG8gHQxtQeHGxBShrNmiRD8qat3LiN6lX/JmTSQQdZ0RrAMT6lwvDi83oSoUTZBPbmDBKc9+HXPDHsbautg1l7CqFxgbf/SkG7Xbe9QpUk3S+t0AAhF17twv30QOqiu+WggVueOmmdCEpjJ8Z6jw3Xvcw1UkUAZ8lr2ZQ2RUnYGWr0c0z//2stEQ9kxLj7Ya2fFOHLf1ft6YeUtRNh0xibTlv5+uhE5MrADeMPQn2HOPfMVvCLSnEsORVOu8uZ5F/OZODUjw3aMtD2MUtXflGXeqiMvZvunbZmvGJUB29GrjoaPXip4bxYT8WKqx4YqhVm0ILUKeXUM6xadHYbM/6jzrLTwLzb5KqjN1S/oAbb+9+ntbi01p81jcZaNI53S+K8JIb7H7h4RZ4oJYLw5TJwMCwp64a+miOS350IvkoOFUXmCtaR+z0twLD6O/iPWTRnHV/qfUYNoFZXlIIz1fq1NfAnf6WB6evIPxEPE6pSfIlZNWY7mhL3CTfq0k0pfXXBtvyZidCECKywIiWS8UVGbXaWUrszcO8NeBmT00HvBG2pECOEEeJNsPkg5m7oxK0o7Qj2fybvJ2D7p8QLKqo+mt7f8lrNravy3SvVHAJZcvF5sADXYn0JfbFd3RQsKu24/5+QJV6nzv+7fFnzUrLVotvY2yU1ffpObutsp0AZ2zN9tgv9ctBIFjY8bNKY/BnegP7b+BsvKBHEfXFaEiNM0M79RwC27zjec1hlXPdnJISu3uusXllEqfK6y6Sh/wCCzzkFwOX6uFXabXSzfvJMiiG/sIlGKX70hw/T4ab+dU+r976sT1re8U2SVR3SEayf7eZiZpcokIegVIZdtRuL0f97D6ontD5xRYbaN0PJmvwXoIyEy/DeMTuFC7MPt5PlDjC923hNs4Nyopil3r52jf21zRhXMx36Qk1w87wRlIqiplNXYDR76kZtPgw7jDNCwJR/xOOWakE7LBmzxodXpZBW8aYO7lqOUCvRYQRp709YvJ3X6c+y389dY8vpZTTs0cDM67oLatCvstr4RCBCzEOtSQaHDWiKQjTaoT68ShY94/m+JqhINTXt+lzsH+eW1tQKRSOwduNAQeRGdn7GJEGJakwY/PbGU5PhHi4zVzoEmJuCnYWY9l0TidZ X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: fda47879-27e3-41f6-0464-08db860d6d5d X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Jul 2023 15:00:43.3319 (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: PR3P250MB0385 Subject: [FFmpeg-devel] [PATCH 5/5] avcodec/msrleenc: Constify pointers for frame->data 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: +MLgsWe6LQj5 Encoders (usually) have no business modifying frame->data (which need not be writable), so they should use the appropriate pointers. Signed-off-by: Andreas Rheinhardt --- libavcodec/msrleenc.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/libavcodec/msrleenc.c b/libavcodec/msrleenc.c index 11f7d2a319..931e7af053 100644 --- a/libavcodec/msrleenc.c +++ b/libavcodec/msrleenc.c @@ -64,7 +64,8 @@ static void write_run(AVCodecContext *avctx, uint8_t **data, int len, int value) } } -static void write_absolute(AVCodecContext *avctx, uint8_t **data, uint8_t *line, int len) +static void write_absolute(AVCodecContext *avctx, uint8_t **data, + const uint8_t *line, int len) { // writing 255 would be wasteful here due to the padding requirement while (len >= 254) { @@ -136,7 +137,8 @@ static void write_yskip(AVCodecContext *avctx, uint8_t **data, int yskip) } // used both to encode lines in keyframes and to encode lines between deltas -static void encode_line(AVCodecContext *avctx, uint8_t **data, uint8_t *line, int length) +static void encode_line(AVCodecContext *avctx, uint8_t **data, + const uint8_t *line, int length) { int run = 0, last = -1, absstart = 0; if (length == 0) @@ -192,8 +194,8 @@ static int encode(AVCodecContext *avctx, AVPacket *pkt, // compare to previous frame int yskip = 0; // we can encode large skips using deltas for (int y = avctx->height-1; y >= 0; y--) { - uint8_t *line = &pict->data[0][y*pict->linesize[0]]; - uint8_t *prev = &s->last_frame->data[0][y*s->last_frame->linesize[0]]; + const uint8_t *line = &pict->data[0][y*pict->linesize[0]]; + const uint8_t *prev = &s->last_frame->data[0][y*s->last_frame->linesize[0]]; // we need at least 5 pixels in a row for a delta to be worthwhile int delta = 0, linestart = 0, encoded = 0; for (int x = 0; x < avctx->width; x++) {