From patchwork Mon Sep 6 02:27:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30032 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp3374495iov; Sun, 5 Sep 2021 19:31:05 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx18kKXnDbjBK+mG5BUNqZLr+UqlK0+KUh687Mas92KM8GfQVPQ5G51OCYiFIIUYB8YW1zk X-Received: by 2002:a50:f1c6:: with SMTP id y6mr10875718edl.354.1630895465430; Sun, 05 Sep 2021 19:31:05 -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 hq2si7784083ejc.217.2021.09.05.19.31.05; Sun, 05 Sep 2021 19:31:05 -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=pyl6r8P3; 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 B74BD68A8A5; Mon, 6 Sep 2021 05:28:53 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-oln040092066020.outbound.protection.outlook.com [40.92.66.20]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C8B8C68A7C2 for ; Mon, 6 Sep 2021 05:28:36 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZBiBThsmQrfpSh+gyLkxnGDjg+fInB0I0UQNzCA9IT/Oc8Z4T6yi+oboaNlv5Yd6C5HBKCrkQ6umRCFCskWU5rsrL5l5kc1hSmNf3bWMkz/7s+kDCB9CinqIFtD/YMaUuVz5GDqRy5JvTOiUnt/5m9F+AFp6n3G5sWvrFPKnE91o/SQR47LEn1BJcCjC4oScQaTVqSelV6gqkCBFXtq3bB/nXmTkJ3W7QHICQ22ZVPsX9dyZOZiUx2kQpEBdrVrk0/qXfc5KK8y6MUpzajmXSPlIkfDy/cC3J2aFhlyEMD+eue5u5tPB3V25F4rTVuGZ1EjhQonyMM0G6aLl3mhLEg== 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; bh=eMsgcEXqaHQASM3dJN6ukOocHwP1CVeQmdiWcG87Oxk=; b=akUy5YYgavhQC9akqEYEnJ9JzCo8HaT8I8sY7ahQP+lLr6YEZFjs2ZwyOR0gs4HG43R51aAb5JByBvn41hPAyTdLyZLMf246ocFXj9S4wvgr+YAXiJ8aBS1HXJ4Bzv0R1AgPcl4FTNL84kuqHbZUC2CHMgEP6KekuG26GNPyQa3pQb0c/8UGf1y3PyMEG6B3/qsO/cAh3Fi4iDyys2WToS24/EmtWeFWH6k/+D6dYeWSS7i9GBUaZFXqDKY4DieDxhVxXPRfPEqb98FIRww72Ob6ApemJRRN44VEPSP+Q1kBal5ZdJFIzDCPyI89QiRhAs9w4qNjMNVjEOLTo0SF/Q== 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=eMsgcEXqaHQASM3dJN6ukOocHwP1CVeQmdiWcG87Oxk=; b=pyl6r8P3UVgZVdvqeMTSoJYMPE2yGNASlfVekKlW0eOTqqpnz0s7tUBOVLl9Yw97dWfv/6eCFXVRJJmm5iY0OY7MT5MvkmSG5XOwSpJd1KLyE+LyaB72YiL64RkTwvPEeA+xvk+NhHJguVMadvR2ZBWURZakfJBWaL7WMrbLpVxjMrDDZc+WXcgRUZ6D9Hs1yZMt1g8M1GZ0UYD3H/IMoZS6AIClNHDGkTBUWu0dAKbBD0gPlAr3s64Q0C2u1nE4xi/nJjs/Or8aM1SDU2HCP3yRnfzT/gYo6w5iIvd0rlvh6rjrdLlVf1QYJZj5VyDp91phcYLosyC/TNYflB1RPA== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM5PR03MB2850.eurprd03.prod.outlook.com (2603:10a6:206:20::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.24; Mon, 6 Sep 2021 02:28:29 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::787b:2156:ca99:fe00]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::787b:2156:ca99:fe00%3]) with mapi id 15.20.4478.025; Mon, 6 Sep 2021 02:28:29 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 6 Sep 2021 04:27:55 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [wGwUDwU1hvpX4Pr1GQ2cMO3A4XFKj1+R] X-ClientProxiedBy: PR1PR01CA0033.eurprd01.prod.exchangelabs.com (2603:10a6:102::46) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210906022802.4072793-16-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by PR1PR01CA0033.eurprd01.prod.exchangelabs.com (2603:10a6:102::46) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.19 via Frontend Transport; Mon, 6 Sep 2021 02:28:29 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 13109e26-0663-4c36-91a4-08d970de0389 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQPQD6tvsiQeosiZzDpp5hDpLVyxZI0WTr4yiwJwJ9HPYhNlZoGVw62Mmt5dIs8IpOnuqhyWtQK7lEzz4ZwPhCulEqHTCkkH6ixvXDnSeTSxfNeCfq3qbNo2h/ROz4PkBdCIDzQgo27pFCWFPtMtjaRBmwpht4FjZIw7IgbdeKsVN03wLAiVm0luseo1wzqoJieU5YOQ5xJOYWUeOwB3vs8/yepTzK42hlAO9/p6ja1EotoBi5gfu4mcBp0RPOm/VXAHjsAH7/aXI8i/eloYS6EMMezpbn6vfWlGgrrNOA2i1eWypHac3QceguZBOnToBGwW0Eqh6gNZYU7EkSWiR3C5WkRdSXbbvcpWbdTS118INCD4G0Bn6dcY3TI5t/UXOmia5O2L92UeVn1TiPq6FbbS7CODqwXdheoUYlrY5M9MhxZjfERIsMQ3st8wkvBvLCTQweRrouM/YEO6Fbxhx93Ovz6jz2MsiJQmcyAbsi0dkUaKgt3WFcR7YDefnTJpoo9b7p17bwr1r9DfH6mGnyvmsZV1RKShEl6Okuieu73ANko+hv0Lus4AevGQ/onUybDQaPHNRetzi4sYRiyEokngwGidfU54lcg/PuooLuye7rwkBtTwFerU71Rypr8oJaI2In5bjrA5+1E50bUfZH5Dk3mgWV+I4GCbi2mboGe9WjOWy1/TTzkC/fl3qjBDRK4hvUV+5VMvUPzki8/LYEidQE4TQN0+8thNOyAlnkrI1IrdZydOH+XfU4e3th6+DQ= X-MS-TrafficTypeDiagnostic: AM5PR03MB2850: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: hlZj4LvaKneH9TdGVcLmfP/kXOVKze3vF/+VhmJZzgg3UHt7vVk7VtVpZ7jXVhIIVdkItd7IAgDSLf0t9F0iCWMiVVb/+hCLdg9wWXi+jYUc0Jgb3xG6SynWpXlANHvZwc2aABabG6QVSmC7RUywoaA+YwijDQ35piZXir6I7I7BZUQMfPIbb3Tph3jWCu8d5F8q9b9+OBtvPLEiKkUkGHjaFPxCnhK/qZP2oqkv6I9xB1IEXLuClSC2mg0Nv3PuYVEVOLLEjmMgFJy22JreCPYobVBmA+v0C6/wfCu5kx4b7eISLuWlnA87xLhF55YbJXyNiJgdHGeCZE0vEAYBnj7OOy8gOcgmT5VobwBkU7Nmx5OkSole3dNL5wbK/YlrV5zngbdEqplNp5xUM00M+DdHPFA+jnWVpq7oQv9Yz81kdzHqwyctvQw1uRjVddVP X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: meNBkeFvD1WdY5N6JuSzeP1GZVpbcWvh60fDU1MwWuxwX+vP81gdInm2ZDZ4djsiuei6eSQuuMNjKwbAGIBvc5sBv9YPW1s144BD42hJldfZDTlAMqwiP408r6nEQ+oh1nBLYfL4nQbRFXVhgwaFvQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 13109e26-0663-4c36-91a4-08d970de0389 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Sep 2021 02:28:29.6194 (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: AM5PR03MB2850 Subject: [FFmpeg-devel] [PATCH 27/34] avformat/tee: Fix inconsistency wrt av_packet_ref() failure handling 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: URQ1B6Ap0rnx Signed-off-by: Andreas Rheinhardt --- libavformat/tee.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavformat/tee.c b/libavformat/tee.c index 759535bdea..a5bf34d083 100644 --- a/libavformat/tee.c +++ b/libavformat/tee.c @@ -565,11 +565,11 @@ static int tee_write_packet(AVFormatContext *avf, AVPacket *pkt) if (s2 < 0) continue; - if ((ret = av_packet_ref(&pkt2, pkt)) < 0) - if (!ret_all) { + if ((ret = av_packet_ref(&pkt2, pkt)) < 0) { + if (!ret_all) ret_all = ret; - continue; - } + continue; + } bsfs = tee->slaves[i].bsfs[s2]; pkt2.stream_index = s2;