From patchwork Wed Sep 28 18:39:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38449 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp434328pzh; Wed, 28 Sep 2022 11:39:41 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5BBNYJ9RBuY0vvOPdNs91C2BbtyaWCS3Q/5SpU+kU3ias4RUpGLxbAk3x3dHyEm+TdYmDo X-Received: by 2002:a17:906:fe09:b0:73d:90ae:f801 with SMTP id wy9-20020a170906fe0900b0073d90aef801mr26595240ejb.699.1664390381310; Wed, 28 Sep 2022 11:39:41 -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 y18-20020a056402441200b00456e1b5b8e1si7586221eda.426.2022.09.28.11.39.40; Wed, 28 Sep 2022 11:39:41 -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=kHss+VpN; 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 7E03368BBE8; Wed, 28 Sep 2022 21:39:38 +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-oln040092073079.outbound.protection.outlook.com [40.92.73.79]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1C56868BBAA for ; Wed, 28 Sep 2022 21:39:32 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bwASeqXSoRaq7ET2MXBSDAG9OLDpiHcZ79ss1ecICKIJlesiY2k1TbaMINaFSp3ZHMD/1LYHz3bILy65V+8gJ2IKjgVKqzUXlEUxC5E+Xcqii7Lej05HecC0xMc5cHFyYKy8FoBa+Nv/ooP6av4IW5+ellV5XMKF8f8rfDBuZwbpysL5zHnSpsFDLTmsxziQvLcP7LnXrFwtqNw6HqCntMZF7v3hguicLGItUxWtS1fnMHYsV7fXiWm8CpJKw7Yz3qdT7r4+RohhyJw6JFo0NN+eGBNcglKljVfTfvDt+Ja69WiDY5cYwH7MKabh6Hv1fuveGLPM7b9CSda0qYwFfQ== 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=vL4Mc7pSurXJzFxmUWJD31wLnHctMY2/L4Z+UFWfHm8=; b=F7mqlgP1Gw1BaoX8dG9j/zZ0JrngOryyFUxQRsrTU+kytPXQFtqlLJcN9EEGoLhOEMNOS5a1XeP/Y1StFx/2KamLXaOOj7zzvFmQZduGIWYruii9S8ypXGY+6x6c45NZ3f0Lb46JFpr5rpLPhML3zm9+plwyXs6g5cAZcQHJQvj6bu4O9WeCLEidSrT3QAQeiJ0RPSpFUtUTu3vftW2xAAt3DYRXd2kb0eJoK/Zmb/lUkaR9FrfyxVomZI6hKGl8koBE/VoIca0XP/GxKs2V4KzScSflpTYv/yz0IRv18g8H9F4JhYfQX7wh3f+Lu3KYTV45za4N+LTYHkKEfE8eNQ== 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=vL4Mc7pSurXJzFxmUWJD31wLnHctMY2/L4Z+UFWfHm8=; b=kHss+VpNROcuJUdOe+gza653wKD7lGmRf+yeC696ef9/9Foxf5o5Y6PtgIa4kWJy0jGnuWPHwyz6wHxAbNTh/6JZ9f+Hg4yczIC5EVJbu6+f6kWAww+seO9Wta2kBtryFAhMMNnBSTRzwgKs33iXU4PiNKcdT1iTaTsOzzPR6wpOsmigf0sGHsoNb6Mp8XMvXRDYakrAiha1CTp3jwvlwk+RqvvI5sOStPb6tQeqmM23ykmhZWRmCQiFl4VyAue2+9Sev04j/Q3knBxf/aY3tSlTAcWFJZh9A7JsyOG4Q3EXthg54y8+e9+U7ORGaKjZ2Evxx32QJHkiVpzke9TgQg== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by PR3P250MB0132.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:177::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5676.17; Wed, 28 Sep 2022 18:39:30 +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; Wed, 28 Sep 2022 18:39:30 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 28 Sep 2022 20:39:30 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 X-TMN: [zEnrqpfPJaL8TUx8XmOQTHjOVUbALah1RM7AAH12KQg=] X-ClientProxiedBy: AM6PR08CA0046.eurprd08.prod.outlook.com (2603:10a6:20b:c0::34) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20220928183930.937329-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|PR3P250MB0132:EE_ X-MS-Office365-Filtering-Correlation-Id: f2f88e7e-b4c5-41c7-485b-08daa180c78b X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmpPcoZqFl/i/jhf7c/pX34T4zRxk+6XLiuNFqk/B39+NRYDfRNljPPmAnpzHNGRRmMea5JUaPgFZAlBsAyAZvmV75BcVkj4cGLw42dngnLDMCLGoiF6bkMyNJJo8N7Upt/4hdE+idxvUB1UPC1m9xLN34FNx3tfSmQoJaxpaoDzWj25masDxpo09JEKMO7uYrhipqSSsLgkTtjRb/iEkJF1hotkDTgBEkK1xGh4MbgOHxXO51vqA9dzFcizlltsSbueRkvcfucYoU0fE3mE1IafuXaitGy6IPuCmU8PhPRNmzliqEFW7RmLzmGfrVMVVbecAL8UmZyjDal0XmScMyuKJLwokqJnUAnMzCpbCG/vVzezlQgxpD5at7LsG5vkahSoTNttcQ31st0nYzu681EBsViSHrcfCqnK2vI1/uCuSz9o5EtXf/Gv8obqgCtG6n0KK35S7pqY3+xgn+ozcZyit95I6pOiYOUQxHCvSbas7HjjQ0XmGTo/Axpm5gKBbGfWA8+BG7ta5d4HoYEWrCNThrBHJwqf3REwI9ck0YKsvmASSwLKE8ICn6A942zUsDb+BDpfxqW2EsQCIXElh+F89R5MHudqoeD43zZpxH05AHYmUo80Nn+3oiLeKgbHrfGgJ6WIyAEhnk/+SYY/wItLZ1ERPcOnZQ5tgmWfyiHHxc1YR0QZNpLrl/g1ifRMI1QQLcApjTfNdzVVZTSGeuSoE5oKcjR9i4P7IqMLS/FInhf3uJGUpYMuxdONF5gw2og= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: xHQnfbBJQF4FZTxKC5pCd5r8dgn/3UbAF7lzls8NBPHJvjccd52m3IUyC5jF8IEcojqhOG5Zz+UtuwUo0R0Pof41E+TSDzEPbSWcATLATUgOTQ1VtMu7U5Mfi3aqmwSLZqWyTViwcQQvhJHU+htmBSJlOOSfjNQMb6FClp9tz0JKsrOdRDjd/dxjaT/iNIWgWNsHsJJYs5jPOrpeh4+RZcaxukRmNGzRXaCpokkGKJqoU8L0iHrHpJQ1LNv5sXO4OmUqtiw2hvJa3APre3b7w3GZkrsBbRF3CYnbCTqEnZXcN0F9thcBtDJ8ikVRCSwa0ZhIH+sB9F6bcaL27Hl6xyitKNceZNHcmpkOFC9Y8IHW3CtmKSz74KUl3H4oRHQw21giek700fGI+ebIlh8LHocucyvxhFz4a4SDeMBSTquqRGPEgIhgKeERdh+TFnc72kh2yOTXlqmz3PFhOdViaAPqHvKyggkyhGmjFlMRrJW0/XtfXeyJbIsLlxf3AK57APga3KCf0tmecvAR0dcmjP57xAF5cIWK8mYmnMCiLlT9TiqYMdBNB/8F+sUlFehEnx1LYoXfg9+VFnqQDhFGZXeNdytcNoz2DzlFKI9ZUOuu/5lOa5k6ayqK49kT+z9irzZYtRvL9FljiR5cz2urUA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: uUYLtPl5BYXeqqjUz17MgvDCCTzYq8gA9Ou85ROgzD/L+Gw+uo8BMsNyfT3esXquD+t6tHkxRqWmWHAHVRpfDHqB1qEEsAXpGO9oY/9Un0XgKQiwuwuma8iwMd+0yh5qJN868pfQLFqvoIfVNCxU1zJy0UC2RR6x0RRgLa+ehstv0dV0VmSGchUXdnwlJSyp5QhBtXCs6x+uV9avx1O4Cu2BVWWzy1aPvHKK25tBQXASb28cCEMvQ9wYPV2wNYHYYY//6NHCwFEufloDgJZTBGGlqQ5eWBKlRUcdL0Y7U0hoZR/YOz4tTE6Bk36aoMwvv4tJZ5FRd5IPk5+fcLmSRbCOkC8F/ABwMzV8Wn+FXsVzXEmAyNJgGST8+XOnl4X4hGXef2SfZfmaObXfL5XFj/LQ1aUpp9gSGoO+4jqTxtDD8FTQ/AzGcULm5ZRUIHAtym+YXDxyFPlp+e2Jy6Flc2QJtdDba+lKL7f+3xaMjGoY8G+pNrYISrVR/cpe66qTIl8R/p1ey5JkVCbLxauLlWrzLP4wbzos/QSPr9A8w565CYrbCRalDQXSnWgMj355gC9IWcyaLtkHDezazgmltWIfLFhtSlAcINm7q/GMC3H/U1w9eAn7sePNwBYc2PVFRl8GUurvwN5iRDPitMnQH3DxivIKDveBELyorLk6CoLPlYn3MTedqUMmo0ZPx28o0+p493YOFG8BCxQJdfyG3FWNvEcnDyQ++715OL7TD7zv/6koAktVUmBMNmGzZWgnKpu9HORXyi7p6+Y676idX5pyNiMduk0QJflkGPO08/ZtPWYReDFbg4TYHluIbLRPoO0LXsdMudCdCkM2dFct49/fs+fsxFRp2DiETc/F1N49fALyYIfheGOOMJG6fMmCoNvlwYqq3+SEq0UOEDp0CjNGwo8mQX+AI3yi3XE81uwmHud5bM0mUiuPUln08G69phH0niJY5HjkTYhXFPUydhZnB3T3Cj7exZTdHk09wySue1aRDqlGUV4QmT5/eXaSzqS8MAun/FTgWhdd2lf4/1MZNbaOTANgITK7oW3gNrqYX5B15AZtisl0KuGlMAlFJwScMaM4OwTpDhNo7GXnT5v3mJQhhjKntbTpYbdI2Yq2Ab4bcLrWoLCQgBg5SS3yc0zDOOyPl0kZjA477dFm2xrdZ3Zi2Q7PzQ2TF3JKjcF22bzTh2Y8EtOyZf05cUL8v+PyYSpfD6qTS3CCn1CSGuc025VLcfWFBhq5ebKI8dG2lbTrcm8YkMrB7JTQbgHco82sN2IWTO5yd1Dabx7K6tiUdpeEPpkyqkh2YI40W2BHTheG7jydPbO55ZEEc2c3 X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: f2f88e7e-b4c5-41c7-485b-08daa180c78b X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Sep 2022 18:39:30.4369 (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: PR3P250MB0132 Subject: [FFmpeg-devel] [PATCH] avcodec/zerocodec: Avoid undefined NULL - 0 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: 3qp6oPnxrsuY Fixes the zerocodec FATE-test. Signed-off-by: Andreas Rheinhardt --- libavcodec/zerocodec.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libavcodec/zerocodec.c b/libavcodec/zerocodec.c index 93fc2834e4..42fb24ff6c 100644 --- a/libavcodec/zerocodec.c +++ b/libavcodec/zerocodec.c @@ -84,11 +84,12 @@ static int zerocodec_decode_frame(AVCodecContext *avctx, AVFrame *pic, return AVERROR_INVALIDDATA; } - if (!(avpkt->flags & AV_PKT_FLAG_KEY)) + if (!(avpkt->flags & AV_PKT_FLAG_KEY)) { for (j = 0; j < avctx->width << 1; j++) dst[j] += prev[j] & -!dst[j]; + prev -= prev_pic->linesize[0]; + } - prev -= prev_pic->linesize[0]; dst -= pic->linesize[0]; }