From patchwork Sat Aug 28 11:27:24 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 29838 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp2288246iov; Sat, 28 Aug 2021 04:27:46 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzzHJRocowJhkWDR8TR30A7J9VLODod0hTQNReekkZgdanMMFJewb9ysgYXAYfj1vjUitii X-Received: by 2002:a17:906:5306:: with SMTP id h6mr14963200ejo.248.1630150066178; Sat, 28 Aug 2021 04:27: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 r14si8360307ejc.394.2021.08.28.04.27.45; Sat, 28 Aug 2021 04:27: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=toXkhZhq; 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 E4C20680394; Sat, 28 Aug 2021 14:27:40 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-oln040092075083.outbound.protection.outlook.com [40.92.75.83]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8DCB0688093 for ; Sat, 28 Aug 2021 14:27:33 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kmkhNWFjZJ7lyrVJUIKdTGzsFeD3Xy930QLSV5C7w1czrSoy0c9/EAmInqBeHb0yuoSBT5ctUvDWbiRkAT+oFbM+eP0Flw9IQJ5Xtofyl7XomjJ8pSU6FFt8AlWzyQECd3IVh0O/d5IqJKyEVv69NE/ocgdzb6kSkDhVKZZqlLUt45yxPjNxJHteciL+fn8njfWV7ZTAC8JSFUmmDciD6I0aEAzrKGzCp+V90NnYZ1+8PsGEq4+DMQHHJvFOlgqVH7ZXuKLwjSvRfGUxduk1nZkqPEAaOt7Cq6vasttP7GCfPI04DOJD5/XUbwdjiXyuzl77CJMTwAFjnS7pMrSWxA== 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-SenderADCheck; bh=IJuInL9EshkfiapfZBLqbPt/o9dSXnkZ4fxY6R71EtY=; b=GqOSAmm8QMGzro8vHJMPqbgsbkTyBXxuRM6RjtQoldvihJvJiy+svFVkKNk94ePE2QFqV/xRuyTPkhgmp2c3im2HOUUNqGnEO78f7cYKRqopukQZ2Ht/BVtCl1j3ygPmR0WmbBPd7A4EbAS9M/HRoQO5jP5YQ7sVtjChetRehhq3F+sKVRcgGQdrw5SftTEVwOgXUL4dO8Ql9ocZuCz+4zb4NZPTptC3qZiEhY8QB8d76Gq7Zukbe9KlE6eVX6BiaJJclCtP0XEEgu8y5X9SHvV9nA/DLhgwnmGK+ehUF/i3yhP1hN5xkGYT4aVR8qVtdSDvgR3NsxwC3X0nGMU7+g== 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=IJuInL9EshkfiapfZBLqbPt/o9dSXnkZ4fxY6R71EtY=; b=toXkhZhqJ/kim0TMXosjHXI3rh7Pgp/Bk4FzLXXoTHqOaAC4tXXgAAOyL0ltaBe9qEciRma05sBkpyKM7mNVWZAQGxIpfbfQIO5lade9GMb0ve/4ZASd/FFNtN8nVwxerP+G2VMJmuL0NzwGk2rFCF2KYIc4++OeBpaHHrNGzhLg1PmKI21XDpp+i+SWmnedqj/BxzzVj1FG1yhnH8z+ofNaK5T0hsqu4sPs8t18LVsc+pKhaYBW4R7AESeR9vSHtMl5SRdj0vfgbaoSQA/7AHyLPXN1pLnrQorEV10kuuf44knGECGOXCFi2RJmx9nQ/BCL9iQ7+vUOHPMTipkXzQ== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB4696.eurprd03.prod.outlook.com (2603:10a6:20b:d::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4436.23; Sat, 28 Aug 2021 11:27:31 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::5574:1fd:cce2:d590]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::5574:1fd:cce2:d590%5]) with mapi id 15.20.4436.027; Sat, 28 Aug 2021 11:27:31 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 28 Aug 2021 13:27:24 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 X-TMN: [/StFHnALJbjCkZ9MLjACKAAmXZo9OMVY] X-ClientProxiedBy: AM4PR0501CA0065.eurprd05.prod.outlook.com (2603:10a6:200:68::33) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210828112724.1003339-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AM4PR0501CA0065.eurprd05.prod.outlook.com (2603:10a6:200:68::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4457.18 via Frontend Transport; Sat, 28 Aug 2021 11:27:31 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 486f030d-c95f-428e-6386-08d96a16d318 X-MS-Exchange-SLBlob-MailProps: +LiGfBxqLEtNCKoPT6rtVE5PzvjguT+vnvZaOHFfojEoUCPtR4S/448m4fkGaHc9GYDmj/h8X9N0mNTaDmHaH5MjFztMNlJ7Pgz1Tn2/kzJgm4e6ZicCqglo0TD2HAKn+RUaZh8g8gsMImni5BW2p15Qq879YQualEFkPmV2z/VgzRwFY4DllXmoAPNQNoAwa62xfOWkODNTbJeQfGmKRnolH2Ashja1z/SkKs4v96sOgoQ6rkImKKTEQ1beuetHRJGNVJEzWu0tafTKFI4MTh5AEbBSECo9H4RvQrwuVr5+jkRLVn5qVexmpQSvmjraOjyBK/yGUZU7oE52O4Th9occREioa0xkJmrkbokDovZcBf3xZCNiV2MxXk1X+EvbqMBx+lOoRecqbOOrp/uGYTke4dGxcrbKKe8ruiGSxtK/InuKQwXNgrE/8Xt0J804uml7n971hyyOrQRnZlAHcPGxd2m2EQrAdzr/PE7FxSZLYUPWF/E9KL/PEXCBpMsz1qF9GAJxk9VWRIPxNBvaUQavv4naZbmPb09m3yqTU5iPfwLIVyc16frn/YWHvijbo+eYqJJA8X1Zb5n0JTpKCeyYtUYkuR8rcAn90yvLKw3T3x2icBtfVIWORCa6u8aBV5jE0P0OippDtEshx31/gfhHZbZ4bI+0pFGH5nif27fCWxUmi9z6cVoEJPh/QUglp3EjdzrGVkgJM1YQYpc4qjxYYO/diFyS6mDFHZ0Y+iDYkIt/k8ew/nCBGtdhHR8NO/dl06VYktC503NaPwDat3TqqrIVbJeo X-MS-TrafficTypeDiagnostic: AM6PR03MB4696: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: WMzcsDjMFCpHi6HnqJ5IFrkgv1TOy1BEZ2bgBw+tnN+bxL76tlWsa4oIPEpw1Ph54dpDf/Ttz1OtUxLZBtCsIWn75rVgdyNTLtk9sjelZAQqxbJiHBQecPJElN2Amg80KljrNBeUlTbRhkBbAqBdXNY6sdd4KRxqarzdlcf8FPQDqdPoODu2ihJ+zg0XKBwhaxkLjP7tIPdrqemo6FdtE8fxPuSE6/jsu0esfHQbr+KcO+baj15/XcVKsnt8c3w8xIskiJeE7U+WQHyw+/dss4yMnelugUdddnrG6YCZPTkGnyPpORq9WYWAPJRxYfILUb0IDimlJUiVJYXGaQO0TaSyC93w6HFcnL7W3+wJ95YGYK8DqOCV6Yy366UiI7LweZNZ8SVPNqZ1N3jEmsj8CRn62by9fpotnLClpcIcEjjihVA4nXzxQEPueYDppehc X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ICMsBnspi2Qms0EB6YVllr9dakzSdz/HC+xk9dq0RM1oHGAp0TSRQTDAnfNxV5sUYdyou1bOXB/Bn9l4jObUIvne8ttr4f4AHw9P9FlR5Zq5l4qCfoit5dXrBYCOZZLQXSFT5jdRJuaHYn/Z2TFSaQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 486f030d-c95f-428e-6386-08d96a16d318 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Aug 2021 11:27:31.6536 (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: AM6PR03MB4696 Subject: [FFmpeg-devel] [PATCH] avformat/dv: Set AVFMTCTX_NOHEADER flag 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: akNaL5G9yAk6 Audio streams are only added when a packet is read. Signed-off-by: Andreas Rheinhardt --- The mov demuxer is different from all the other users of DV: It does not use its main AVFormatContext for this, but a separate one. Therefore the new audio streams are not added to the mov context and so it does not need this flag (and it is not added for it). But there is a problem with this approach: If there are multiple DV audio streams included in this DV stream, the packets will all have the same stream number. Furthermore I don't see anything that prevents to overwrite and leak the mov context's dv context in case multiple DV streams are present. But I also don't have a sample showing a leak. libavformat/dv.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavformat/dv.c b/libavformat/dv.c index d7909683c3..62c20f6a00 100644 --- a/libavformat/dv.c +++ b/libavformat/dv.c @@ -343,6 +343,9 @@ static int dv_init_demux(AVFormatContext *s, DVDemuxContext *c) c->vst->codecpar->bit_rate = 25000000; c->vst->start_time = 0; + /* Audio streams are added later as they are encountered. */ + s->ctx_flags |= AVFMTCTX_NOHEADER; + return 0; }