From patchwork Sun Jan 9 14:51:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 33166 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp1990034iog; Sun, 9 Jan 2022 06:51:57 -0800 (PST) X-Google-Smtp-Source: ABdhPJx13UjGoOZiczdSeuh3whZFCItNuCEK5KqEDToYCVQWh7dj5Nu44psL2nekqjqW/EKFYse1 X-Received: by 2002:a17:906:1405:: with SMTP id p5mr6822754ejc.113.1641739917310; Sun, 09 Jan 2022 06:51:57 -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 s1si786663edq.479.2022.01.09.06.51.56; Sun, 09 Jan 2022 06:51:57 -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=E573TZg7; 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 7BBAE68A6B6; Sun, 9 Jan 2022 16:51:52 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-oln040092068081.outbound.protection.outlook.com [40.92.68.81]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7C735689F94 for ; Sun, 9 Jan 2022 16:51:46 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=a6Qt3Ic3CBCByU8Lq5+mqvNyNF5k0KeH6oUYhcdGmBXfkHKvThgAzSkZw5R8Z2wApzLiMqGonlwX3afeGBN880rwKv3pxO0dUTRnA2wRnDTbLRfrbpBxTQubelbKYdWZ4UbXNkb5C5d7h1Zz4n5h+yq+dMpxGj48Csm9/QoVPBk5JrbpFNBsv8fKL8fVv+zE0eG+Bo1hDbPQBrj00WULrRWJWV25mXkiOMeadaNBhKt7D23fp0V35U5ePwz3V+EGieY3MTVvN7NfpMhm1MRk0NYLHV156shCd85TFrrw06AZSmaJ6DjQmF09uzm9JZe9b5wtyGdH4MDUdlGa5end4Q== 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=yx4+Oq+tl0Kvl5o+/+vvd7JaVENPM/jbJ1KpdOaU+jY=; b=EzMCCS10ayichYQPxRsU8ZO6PK/KQZosVTlf5gLMFQMnX/arYkO/+P/C9nqEmzlgXyakVJsuOzbWnh7VSrbKgsCF3INJyqqDbiUG5buM+JCIUFPZr99K009j32ma1dG7bgk7Ibc6Q8Q2pZKgoXSrhav+PCHLPZ9jgfGaqaWIioOvXoKERIIWQU3NZjcwIwwRQ9/pWsUcHXGmxbLQyiIOsQ30EVGxoOXr7tzIbHekEq+d/LAFvn4BXCAhHaRzvwX+U+DmsxPCRS7FrUsZ7bTDQR2jrtbi+nxU1Nb3e9E2PRWZWPfy3oz62a8CXdGAt69/LVj0GNXJTKls71W0tImg4g== 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=yx4+Oq+tl0Kvl5o+/+vvd7JaVENPM/jbJ1KpdOaU+jY=; b=E573TZg7DzzsZN4OQUGCl4m7o/RYeCpBzwzj243hnCId/M7w05xZGOj5S2ZgmaQGRV/hXDz/zgAdGHcYjD2m3WrfGSA5EgaamASuIgRSHYQUV1h2aBr1rE9VjULGjVoSO3mE23ZVBdf6WxATVx+ZNjcSOJ+8BMhOaLmIlruakUrZrHiUqiOZrTIYTaPpvENdFy8jhoYuGliKZhpnjmol49z2D3p1dEwcSKVvKbqI9Xlx++qE2fht+HJVPXQ5s4L75IL3t/vYwdY5hYrLvWqJAx4pFnKgF8iLE/Ui4J+0gInsh3DSBqqhqxOnMtKEwDl2bwPiHpfDCOvIMCO/2Jij0g== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AS8PR03MB7063.eurprd03.prod.outlook.com (2603:10a6:20b:293::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4867.9; Sun, 9 Jan 2022 14:51:44 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::19fc:be9f:2c9c:53f5]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::19fc:be9f:2c9c:53f5%9]) with mapi id 15.20.4867.011; Sun, 9 Jan 2022 14:51:44 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 9 Jan 2022 15:51:36 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 X-TMN: [Kjk+7pv7qhzZ8TOr75G/kocHzwS+0MCG] X-ClientProxiedBy: AM8P251CA0015.EURP251.PROD.OUTLOOK.COM (2603:10a6:20b:21b::20) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220109145136.4040572-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 0d80f40e-7b9a-475f-29a8-08d9d37f8d7b X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNWm3GLoeUntTG6KfWWWbWhllSvyGA38X/FtZJVNczApH79HIfywTixtJse4grv9/GeiK3pvTaYMap7J1jMzIbP3GiycrGH+GIehWtQb72Dx/6OCKsw4g5r670yRQIC4unMycNyORYqKKj1xkNxMSgtKoFpOEWvBQEDiJYvs/JQHOjZXGxorvruVMgz8EmIJDGb+1pV79ZoJtfR67PTfiq4AoVIV7d83c8PJMIQTIE0ybIrhdaE8LiClbfVbip0BAMY1N9zH7RMwzw2XtQK8mO5WHHaXSWZfggeEZzPezYGYc8LZTwH71G79RdCQcC0x6LE7rOEBVrXncRWwra96wb1E6+wLFN+Dan2KRaL/wtptGsKtYBGiBtAG78irINCpp/Vd5FgQSWSE9eC1Qi4tnQzgx4sHxl9A8w/ev/UF4IoLPnws9jSa+k9iyhfJuCgaeDoFegB9F4DF+JFJpkhRPebqR+7WW6E83a9WhvO35eUKXo1kyJS+NAydhji5X/bf24JpaUwXf+z/+POw5zZhc74ePFGw6ocibYSCn1r/dO4wfb/SGvKYMxNtbzItcfAoU+WGmxmxAJw8i92I2l1UHpDy8eSN//FOz9yHFktGrP4/F7CEkDctMxg9iNrT8j+Xieq/ZELl961gaxU6gxjYgLXtk5BdvrG1Dzd5Tns7aMsYKSckyGVo2zlGjnrtc+2GsiVHcKyGQHTQ/BHtmrxhkIZop9i8A9JmPCA= X-MS-TrafficTypeDiagnostic: AS8PR03MB7063:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ycVZyUDf/GB95hw7+DhDymypkPQGpVs8ejj7sREkjEZOQ+t52Xx498dPO2S74W80f9MzGVpGrq8wfOGfQqjuXxIIeoMUkYa1R8eGvKu+wR79WcslCRYNM6m2IYAJA2wSMYzkGA8uzBr3LeCXHyrhN1YlavycWFZl23le2LvUbxXmMktncJUD71m6DcRRaCxHmJ7vUs7RbnakvYqt982dP/jKQGARxyod0rD3rJUwoBWagFnGhNlgTYGLwh+omxrRELGPG/UAkX6Qrb6JoqFqUqvVuH2L+TCmsXnmUo2UwdljDYKbMkfvWDjTKf9DVuYzDGiR4gxzArZzHj59LJDD33EX4Al39bR3v121qhXh1YRGp+kE1WOEgPALlMg7SDybVFM9Rrf2eID/fzzlzSMMvJY8uSpblWR/uaoZzusGOvO/+TpZI625t5Oa2DGi62NdKccg6/PfS9+vDx3Fp9fewDb6SpahcBSobf1akwc2T4F8gnhEfQhM9Aw1IsWs7WygFS4zosZAjkUtw6+lMmS3BXX7jQav4mxLrPix0rSyfHi5CjmgE6stw4bEPx+gba6lFaiqVuFZwSq4jgMVxxojmg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: NaWdQlHdmreAtpnWvMzn+wdnpD0gJxBE8Rqsp2FDKhb6x7cRdCF/xL3ESxv8zPOEpjKVdudFRMauohuyUNSEdKwYN047MkLTEvJVwKFkZ0h2Fsc+h9C19nZNEym24dGNQxtR3bCX4OgjU+u/BOGm/cqZmw8ymZ5a6N84lEcr220y8737xFkeh3HiXmlBh5/3dhMMCbYep1vPMcowMl/IQU22omYR7fIDCi5Rq/KXy+ySK5TBwgC4B4Nopf14nifuD1Tk+dyxdQWfCn6oYjihfRY3nM2uUpZMbBhs7yxHSwB9zgLhOjaOKyr3yB5mMbAH57orodKmwVbyO52RkVrSy9KRI34dQARi7VDtMBXeKClC8eJ/Kzq9a0fdKs8q+UVh57sUH4/Gyt54qD/y18LjRdtQfMFf9R6uFPS1GDii6HW9tV5OZkMUtDoPAtdvX054gXH/DNnsRBuuIg98jsuQw7nzKDzM1PCE+g2KNrEL25lccFi4DH+oZxwYESHaC4n0JIQOouI0eRjIsLBXADY4+NZDUgLtnr04mE1ze63AZNW40sGSz/RcycIrD/bkx2UuCkZFHJ/R2qRIhjO2WzZy/5gzRmioheNEGAAwKX1AUPVlSZ6wubIzt7ZYPpIkt+hYWpchOiop4KLun8SNY3KoSyQtG9ZD9Pb0airW2jSQv/MwU0LNVZ6JDiPIh6vqmza+XgoIN3SKIKOOX9ak22agB7rR8DdUuTJxNNE3Um+zRx8Z9hDNIUqeL7FW3N7xZma9Op332Fv6viT7PsP0Wynx3l8+NjTXIBdINF33phhzqTlsEri/xHwrxDtFBwCHmAjkig8IS4+YD7bJlrOsU5d3E5uqbUTYbA+xwdm56JvOxhNFk+AJQt8SB6ea8oukQyQYhlabZbm5kh/3lktJoXOKs/+5lYYugigchpq0mkGX4egds3oKcWJ6H5TxA9j8THkEvMdyp0pPyGYkTKwG7bv6Dw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0d80f40e-7b9a-475f-29a8-08d9d37f8d7b X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Jan 2022 14:51:44.0414 (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: AS8PR03MB7063 Subject: [FFmpeg-devel] [PATCH] avformat/amr: Return error upon error 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: AHQ/Sq+lmH3B Signed-off-by: Andreas Rheinhardt --- Will apply soon and backport. libavformat/amr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/amr.c b/libavformat/amr.c index 40d5bc9cc5..bc22c2f84f 100644 --- a/libavformat/amr.c +++ b/libavformat/amr.c @@ -91,7 +91,7 @@ static int amr_read_header(AVFormatContext *s) read = avio_read(pb, header, sizeof(header)); if (read < 0) - return ret; + return read; st = avformat_new_stream(s, NULL); if (!st)