From patchwork Tue Jan 18 23:32:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 33649 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp4236170iog; Tue, 18 Jan 2022 15:32:53 -0800 (PST) X-Google-Smtp-Source: ABdhPJzUip2hbwtZzGN4qIriQbWHxmEVHZzHiYYnXjWiJPrOvzuhRwrbqUWyY+dU66IGxiDUUBV5 X-Received: by 2002:a17:907:728a:: with SMTP id dt10mr3410414ejc.78.1642548773387; Tue, 18 Jan 2022 15:32:53 -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 sc33si10669194ejc.767.2022.01.18.15.32.52; Tue, 18 Jan 2022 15:32:53 -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=JeLuVxfA; 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 79AD668B157; Wed, 19 Jan 2022 01:32:48 +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-oln040092067045.outbound.protection.outlook.com [40.92.67.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3FD6268AF9C for ; Wed, 19 Jan 2022 01:32:42 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jJbAJhes+3v3jY0tmUk+AT0kpomYpUWbr1ZyO6unODkXRDDcmbZZnX3lQ4yOrsnQySL4/aGcsee5wHz293UiWytYY0vD2U3LHflHxyfmA4TMVRP/7Dy+IdDYkTmu2rUc6DNl1zMNmB8b/a2rCAPq9N1t6ygIETYXqNFSut6tTpT++uqmKMYuWPpIeDAZSDey5sSAvFWI/NH1XiWrrBvRf1WQVnQn5lmfKzHBNkcmjp6St9mHnwZDH+yUY4qyTHIfMh2xPKpPBJvKUEqPyKYidK6p87zpPtpIRDX/RFkPfaToIfVS6yUhB60qUICHI5BnNSv5QR3sOcjRlTxWH2oiPA== 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=roDDi7nxxcFKo1ds6mJOMS4cflg0KcZblyfk/A4/uhs=; b=S3DTO6rTjDj1TqaB68mBg1RCZMoarQr1GhL3fXmOjPNVf5xiMsv7sAmQQPNAhbkJ9TyrurjO5+aqBJ6ggyuL929KGhw2F+muC887mYdN7SLu8HQrrWItf3ILcAebf35t1MEHQOvWexuksTeLkBAFtxmhPDXC40A7AaM87zPbrLGt2sZtmK4lagFgSfBdZj8TnCh4He5DwiaNqIqbfPoWrwsUENBQFg2ZdweZ8RyZdJt8XbQYz00g1p0DYmGlFOzYGS3CmoPAHOGjf6BOb2gx+nWY2JxyonM1bDx349gTJJ1+k2Fbo7YkDZA/OMH4naUXH4l0z3epGIAw8itUAHJvYg== 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=roDDi7nxxcFKo1ds6mJOMS4cflg0KcZblyfk/A4/uhs=; b=JeLuVxfAxbiBuYT1qh+SwZ9UDTPcH8wfap68Epi+Sb9WMHQjJbJPkWo2JFNb6qc5iob+rdPtscf+mMId2MMBqpTwNdTXCX2JufvhglgBm1k5A6StpA+kU+8B/HXTGhrFue6aUK2DWmzdwRR9SIQTSLEghU8sXtao6xo1dzsZYWXC1jvhqoD/Hpt6f8A01ua8C5MjS19JHBrRwj9gzPKesC9KxlJXPa1s15mF8IYekPr9nVzXMgZ/y8ShnJd7bAVSYXiMEGp7kADgBIVoHTlwe1h/wHQhdzDcbXyTa/dIKRmkzYl2MPNDDfzy9JYKxDUIAPDE99C3ekVbXU8D6Q/d7A== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM0PR03MB4529.eurprd03.prod.outlook.com (2603:10a6:208:c4::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4888.11; Tue, 18 Jan 2022 23:32:40 +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.4909.007; Tue, 18 Jan 2022 23:32:39 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 19 Jan 2022 00:32:25 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [Z5JsudyR7hVfY+0AVNA8WBSgWsH6Pgni] X-ClientProxiedBy: FR3P281CA0044.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:4a::7) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220118233230.743570-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 3e3e9b7b-d09d-4f5b-e876-08d9dadad108 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiTy/gRYuf0ZoZ8SwmTovZBiXlSYvC0BKXun99P1S4ffpNkDFf6hAS/4pBjc103qG/TcZ6GSJHqZ48dYFoMjTCmk845Uu6fuq/ptXs8dDfCfE9qdP+nd23pXAHqg0evSlowDK6PjZaffwH82MMci+rV7fnxXC7SGGXWtxdyAKn773NKkA2QAzzpkYmxJVYEZNE8SX3PeQMBrC4J6wQdu8VhAPZIbBvo54meuNBcxJuEYEwaob3T/iXK/518IcChqLNir8PvgKMYJc31Z/XnabObTkK+BOhVbwT2QmTcEbjoKPic6JF3AJPzndJBhUvZ0Di19b4KsOiFH0Fwb55X9e/1rLHSWhzopSdExpNXg5Om+lQMedBe4eEdn2epuP0+HX2QWiCWUsFMMDLXOefYbGyPEdHgnIqkw0bTplQJz5KzENILSNbQv86urFrS1KMFOProYPIbllBxZ4VtWLJeHso0Cs/9R3N1EyZCrcSH9Sj8Jvk9EMMRbIudnXb0LcHqZd+4ylew0fTWFdNU1c1IbNqhMLaS4mdOM6kAQ25evNYH11CBh1sfPgcOMFSbrV52GeiDFO2O6ufXJuyIXW6L4wCfqKO5Dj7S3DDh8o71HGRXC/g+4pZxgZCR+iqJspVPpConOUQC1cuVFEbSRiz/Sz0Fxw9FECjiKMQtZKZs9a8+qnbL8gWJEQ9r7BI2I+VorKsmPXIGX7CmvAnAkRXUYqr6i3YNdLAK4DZyVwoTxORQLHPieyKYgmeVKejgivrZAwXI= X-MS-TrafficTypeDiagnostic: AM0PR03MB4529:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: G61TO6b/Fe7iQ/zO0EDuiMdaM40c5Vd8CzB2Y+so+PMUBcVWLUp1SInjCqvrGr4uA9wWCfFmIgn9iBc7kL/xCE7Cee5AVqNwg6guvRp2PbULAoncKpnWC+7YIKr5vw8QNZysgKcaex652cPmrw/o1eWkguh6M7yQP+2wVPEwNdsXgKJXPF1ZjpVu1VlDstKP5oWoxdPv8O/l+o9KFxzOwedvl6spj6kOjA/ji8/PWmVObZ71VgmCZZlTvBMhGMMJzsqMYIFVcyIdpex334rhfi45SUx27rVTB7FsuO6pTQzFLA5+FPyaN9pVSjT1SxptAO9nFLZSxnN4Yr3DE36IH6DIumxV8zAvpLO2fmQAHclnkniL2sVmrhGlbolCgDPHS/J6N+yIaxRAS0B9wG6VmzA6/Je/WesQjDVVBnl33IP2nmgY1xYGzGKgdqQMxQf9ck9Kf/ixRpnNtd/r/FkoNL3NDAKTZpoxr8+3l7gV7yEvckT59YzIk4ucsuHZyHdR6oyPLJskDfu0b3SUIpeat8tgKYvO8xYRKdlaC8xSf/0nN4zvkP4JqK4c/EKY/akunhwGEQz4kfi3C8hNolUODg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: x2uaXuIrqMgN2cluRbFsvB8CyO3YhCzCmIJ4xs4+331bYzvy3PVcJLJfOroq51nFpcaPIrTuZioQkhPRr4q4cCHjPyG9xLzTOrBnaB4owEDfi8QbUpwyYvFFepTgT1aRJyKy+IoPx2jbOAaVAHtmXz8g9kGVPbyFu5BT9S0Ykn06sebSDpis/7h2kKM/M29BOS70ueSuXwBYkT7RwPjbgpwInyTamRNLCUigbPF+sJkTlIfl0LWsCzhIBJ+t+770zWi88Fola3Q/YEuNAKb+DrUouWtpy87i9+dySo7Vqdk9Hr4jUtZbdn6KGSihfU8ZWaSmlDw/UUC1haPl/cSQNrbgaeubK9fIeusFZTp3r8t9Ae0QMSOCtzVlRi38w5t5KHGyA8pEG73v1Xzdxl1WKqUZRotZChzRqrby0AQbv5YB6Z0ZLL+lEVMUr+xTQmTLsJx+tr14Mr561CaJr8jrTU0YJM2eMwRvjSfVdBZeIu8X4+e3LJ1Tq9OOQkiHrKGOKs0Iyaw1Gu06e5VEZakZoSQEWtcZA+eFHhfIUb9/YTruO+UalIJSBCBvFMjYpzSiLvFtmk/jsQzKGKIMSTYyHA7W99SEPCOhw7mkhiXKIBGI8bvVO6DhYPeAMWon/K4YpTbZy1V09c+jhtpuVff1GVvF/ZHy4nZUU9dzjb8oKbPtH1hzZlrLYQE+fBTK10BOhy+nmvKB/965pW3X5BWyfVmw3HzZh+5nZpMaclLXD9W4lIvbXN3uYa/dLPDSYi+QAahgR/CCYILxvxwqijUTavEdIa/maZWbgA5ml4ZEIZdiLnbr51Fi8I4kJ35qIStt86K15IMdlSGtrTdQgW0AOBwTEMx7X+DevqD7YhYo+5V+ttrVDhxzTtrsyVJ9DOEjVCgUXLv7hfNoLq1E/N0jNdiknzV+YGBXp9uFF5gtlgz+Zmt7xld2nZK9/jjyyeRF5qemyiqtG4lNrvnPpPxOww== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3e3e9b7b-d09d-4f5b-e876-08d9dadad108 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Jan 2022 23:32:39.8757 (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: AM0PR03MB4529 Subject: [FFmpeg-devel] [PATCH 26/31] avformat/mux: Remove assert based on faulty assumptions 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: FU2Vlg9dOxb5 This assert is based upon the wrong assumption that the noninterleaved codepath is never used; if it is used, max_interleave_delta is irrelevant. It furthermore ignores audio_preload. Signed-off-by: Andreas Rheinhardt --- libavformat/mux.c | 1 - 1 file changed, 1 deletion(-) diff --git a/libavformat/mux.c b/libavformat/mux.c index c387f8ec6e..e34fd88f05 100644 --- a/libavformat/mux.c +++ b/libavformat/mux.c @@ -697,7 +697,6 @@ static int write_packet(AVFormatContext *s, AVPacket *pkt) ); } } else { - av_assert2(pkt->dts == AV_NOPTS_VALUE || pkt->dts >= 0 || s->max_interleave_delta > 0); if (pkt->dts != AV_NOPTS_VALUE && pkt->dts < 0) { av_log(s, AV_LOG_WARNING, "Packets poorly interleaved, failed to avoid negative "