From patchwork Mon Jan 3 05:03:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 33030 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp15836373iog; Sun, 2 Jan 2022 21:03:40 -0800 (PST) X-Google-Smtp-Source: ABdhPJw6zp5emOkZGAmRQ7cmZHE/LwgAA+Ue0Jg9MPPrp2PuNTDoyyeXqq8LvKUEht6ujCcJi5qr X-Received: by 2002:a17:906:5fca:: with SMTP id k10mr37424641ejv.722.1641186220482; Sun, 02 Jan 2022 21:03:40 -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 l14si18524766ejo.394.2022.01.02.21.03.40; Sun, 02 Jan 2022 21:03:40 -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=rlufNqOZ; 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 459DC68B1C7; Mon, 3 Jan 2022 07:03:37 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-oln040092067064.outbound.protection.outlook.com [40.92.67.64]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 117EF68AE10 for ; Mon, 3 Jan 2022 07:03:30 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Z95JuHxtNzFPZJRY+A9OhvnWbTSlvaCTM8BF5NVdgmgcik7VgO3FRM3d/Wq6QazkCV2M9BXd/ywL8k9Ore4uMj/SxXG0rIIqVzAnaEIXHrv+/jMtw2JvA1VN/7gms8WMiLkTl8rUQNjL+kAjH5Vbs9iT+JKqUPPJS0Ih7uTctONZgEF8eI3hCv/ogOYbKLO0oKYpPl15FOt62cLQqWbkQVLYlvEZKXZFtKBm8GblP0L/KlUGuM5KIQyu2gE4KbJYFusq8hgb3I8B9ZdNJeROl4xObGdVbZJ4L+crLVKl+gzHdFZmj3saCkLm5UBXC9gGlG9WyKPAqF+lhmMsDNJOkg== 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=6Df0QlgzW8tgOFY44geBUVV+IcLNz9oS4Y4CDJHwpNs=; b=SM7SNu4tMg+EB3SQASnOiK+QQIiyY8UbiM+ov/B2s0QnTXhdDO2977/RraN9hwAvYCsaWXqWesMGP+LJJxNkqIy1+LULM3/C95EqIi3CQtATREs1sutGFkmWJBpUF/pijgdY0900xVRpSeAP7KAmfjfESXEiaYrInORpGaBVd69rfy49FmSEnUiNGOmMcMopYRA4CuW+akVI0oOTJT2kqUExLcoxN0xYfaFKBUBbtteTbMiPEOc/pa6j+LfGLgJwv0MAgB7NB4yp9xjb3kpnJNmL4srSbSrP4dkFm9cnoBGYE3yWj0X3xRdevSEyvBnMhLbrCNOVfPQ3dOHbhDG0iA== 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=6Df0QlgzW8tgOFY44geBUVV+IcLNz9oS4Y4CDJHwpNs=; b=rlufNqOZ75XZVj4WKc32GWkzj9hG4N/ClKgEq78UJ5gxJ277fdFbexNLhrrv1cBpgGehTZyxyfqjZs7Fr6DAXXunaJ/cOtiaZ8EWdETjTxD1cIMqB//aUyG5MqTUd8kAyKJoS2ACjPo0bsH/jhUJKu2e3+2QiXRAVcpkT/Yf5f60xx+J9aFpzdpInbRpuSpgt4rEz81NVPpnDJIwfOjHpyNyuMXgP614EZF8xi3zE0GhgUXRIilQQesmtc4UuiM2wHFEt/vRhVcuG3ApE3+zAcm5iKw338rPYi9naHVe2P/s1NkFlLtVvQR7CXnMJdN/bFUyTq6UnbDwEPHbHw8+Ow== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB4213.eurprd03.prod.outlook.com (2603:10a6:20b:1::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4844.15; Mon, 3 Jan 2022 05:03:28 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::19fc:be9f:2c9c:53f5]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::19fc:be9f:2c9c:53f5%6]) with mapi id 15.20.4844.016; Mon, 3 Jan 2022 05:03:28 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 3 Jan 2022 06:03:21 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 X-TMN: [C8PR1zlI5xHW4gSbQYl8Tk6c26FnDc1Y] X-ClientProxiedBy: AM3PR07CA0112.eurprd07.prod.outlook.com (2603:10a6:207:7::22) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220103050321.6243-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 187541a8-375b-4341-9ec9-08d9ce766176 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiR3EehW4kxQzdNcP2D/mG1JMVd6EojOT429+PLBytZgW9A4xEuwfD3WoTSHOvUPjiHc6C51iXdfFr0zyI3a5tYjAJDNWd8JLPk4BkjLmOptEyFFH1yH/oFVKFltOxahG9aXMW12OdmYCnEsVj5KOflzWvSiIcTyRS89iqrksyFtL6FvHgA4ckYJUryN9pGs6llQRQu/L0eDfS+AKkHm6m7vJXHEQYQ0Dhxn6NZUSJnPayxwgk45ruhWaXCxWPLgVHO5X4jW66zJsFTktCqyLlLEZ9HFBN3I4ZFXE7YGv2hcVRERCdokRVphvTpJt6ovws5a19qlxxLXS51TZ7Lccq1gAFses6kDv2+/Klj8rV+fjhF2Wcj8GCzTdzVjTbzuPBJM/hTOrY4D6cvLjGgkfRXdvqaHSdDdFGkpfF/AQ0o/zwk5RatADE/714lAagr4xaVYm5NwrrqgGp8Bc+XTWiWCPihYxXOFoRlOGBrbMyJsU2U3QsccomTyFD/5T1lJ74NXtVYVjchxOAvDjV/jfwJ3lgrwxkWt1dWyavLT4DvhXYUGbIKjNpZWHpJByOoVovSlTs/rE4tDPIaip8kW61DuFC9OT+8lli1iQFieuTmcG97+bfxDNh0bfpfjCsoPbOrNRVoD0CNu4Jj7yuksRBq2+ld3ue10Lu+BYvW3kJ3NWNtAhInrjVk9P+GXYLWHR4hguEXGv4H0+YwEWi0+o6caZVXyRFMPhRJnfubZU3f9vKVBdnk0LWNhAC7h/x5tO6c= X-MS-TrafficTypeDiagnostic: AM6PR03MB4213:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: JAZy4VQWBOWa1l8kPzOmAP8mvcWnpOV6CbvmxBYQsz5qqBl7umDXI8PGEHt2JGk+sEe4ixaNf838XuhkotvmJHKOGgZFfkWod5ic8o6yQ0uBLpBieeY+Tt0kySc3hcqxSzXwFfDCi2i1ovfGGEhUcsIUF0Aw0f+CKfce5kH2Bub7i9ueXS6S3PJ/yPWJz9h4df0FPgsqdG5RE9KHeqz1gqU6Z5QOjtHIvZB8GKYK0RPlvFQH7AxNyHHvDeIAIVEFEP7TlRq0TuXgOvZSg+0ogYVFbryJakDPRqspLUqkIPp5xq17pcNd60sMtmXG5EH16S5oRL16/JNw6Cg8pbQGuByN073wN++U8iw8vmJTC0uBhwI7iEdJj+Vxg0y9+cozDIRsCGCy7iw9WTT4SqedVVzqIelMzLKDnq+VjtwmHKAmNJClQu2oh7zQ2YGl7Z6PRLPDVLWnhLTFQ2biXSUYdVX29g179I5NA8mGdNWdvuLj2PoBONFtbMBfAjTcUc6UCY1wnPS96+JSwlfPyfeSA/zkTzD4Xejnivh2lMHncPrAy6s1MxmrO4nP+1/81Jhif6+UR0gDn9SmhABUkO/PyA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: BnPRC77J+buQk5fgusSKVc2nEjQFGqZqTg/UqENaDpQwgvaGtSifSDumlXqjwG3Uvpgsfs4lwE6IIK2enQXjtCCSsQyVllvFyj6Cpdtat2EbrzFSDuSS+4PCZQCxL54YS1dJV79Kd6wCuDAV84uGWPlPA8jefVja8Aj6ta5Hc9nUitdOcIVoxpAxG/5ZN1PwKePXC6IPzQSNQnVv8ra4i2Ay5XJ78QWYiKZaDt5b7kVZZ9mp1J2UD9eeJrFCViOzHStXXCL6fScl0aeSdf/cpnVR6lUBLASLdF+ljXOlil3OzRUS4MsxkzqzqcE1rqMda4iva0frWpYzQ/gQQ0WzVSEldixmvSbQs/tuwQR4PNnvAZbxpSP38jFK1+8CTxcsazCA/XdWduxybQBtLml0BW1Pcs5tFuJQHEagYz01MgQMgchjrYIJpbQdgkDfQALE7XPVOpc2BtzLGGQo7eg97la2DGiMCKidLGUaAFu3X7QZ9iqcwYEuEikmrer/TspLjesRkfND4tpxcFPysBby3KP6rnzLxB1yN1+IfmS5FFHr95Llj/xyh7CmQ6L0s1a07XuIw1Sp52e/YBBdKZ5AQQ824bezqwuTCWHVl6rTDGv5Tv7b+pUimF6fWAxeFj7C7Ns3ebwJqAxXVEVYKXCmRFl7oRiEsHDdU3aeudlLDEuvMjQbfVx3o/1UplYeFFo/Dg2khJZ65CKq4ZoqWsIysqQ5G7sPtNW6RE0JfyXkZdecttoqnHWSZwMxvQlAo+Ek46+7fRtOpa7vu1wJ+o2iM840vvLRoiJqr3g30OiiyAS7pREaSBwLJVgqVd4mYhZ/id4N9ZCcluv96+iJk61zSTTn3Z7QCQrmMzpt8fZ+I70Ycf40QDn4tcfstk25LW1QvxK7Qm12zN+MGEdGnrRgG6JMDmggNxTkYENwCNYVrXd1AuwxBd5HiL98bulExdiGNmbGZRi1bYuqKHV60ouMCA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 187541a8-375b-4341-9ec9-08d9ce766176 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Jan 2022 05:03:28.7981 (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: AM6PR03MB4213 Subject: [FFmpeg-devel] [PATCH] avformat/imfdec: Actually 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: y9lpuxT4mLCN Signed-off-by: Andreas Rheinhardt --- libavformat/imfdec.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libavformat/imfdec.c b/libavformat/imfdec.c index f17064cfcd..da8c6cddea 100644 --- a/libavformat/imfdec.c +++ b/libavformat/imfdec.c @@ -564,9 +564,8 @@ static int set_context_streams_from_tracks(AVFormatContext *s) /* Copy stream information */ asset_stream = avformat_new_stream(s, NULL); if (!asset_stream) { - ret = AVERROR(ENOMEM); av_log(s, AV_LOG_ERROR, "Could not create stream\n"); - break; + return AVERROR(ENOMEM); } asset_stream->id = i; ret = avcodec_parameters_copy(asset_stream->codecpar, first_resource_stream->codecpar);