From patchwork Wed Jan 19 21:19:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 33665 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp5180810iog; Wed, 19 Jan 2022 13:20:06 -0800 (PST) X-Google-Smtp-Source: ABdhPJwxbxmNFII6fw9iQNQYjMs24JFeLKX987AL2IDSGS4SPIGplYFyuJyXHMHAb73l13VtaI2O X-Received: by 2002:a50:fc16:: with SMTP id i22mr19678036edr.345.1642627206018; Wed, 19 Jan 2022 13:20:06 -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 ds1si570574ejc.775.2022.01.19.13.20.05; Wed, 19 Jan 2022 13:20:06 -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=k+IPk6YP; 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 4459F68B186; Wed, 19 Jan 2022 23:20:01 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2031.outbound.protection.outlook.com [40.92.91.31]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 429E468B02E for ; Wed, 19 Jan 2022 23:19:55 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WIHh2xFpxY+0T3plqG9fwffU6JDtJ8q/ufyY1PcGBtMRrj6DelKzjDwBupfpG1/mmLrWSSKSN1MGeWwUomPKDQs5vBiP2JQ9i8ZtXdVIa4EA+Iwu49kRTuS9rPyOYfoUYptMcuXjnwE1o+pJ+RR4RHhiYBbFtCB/saNvFP5xOE0YG4CBsYznt5tLJyCLyu0QPM3mBboqYL9kv6EeD3E6pEtcfYihhJpvhhUnZd8U397t06FjnRSu2wHDqfkyv3opc60ph89lcz+pSl4Y0TExTFtYRgfZP0JxY6myV2Er9e2SLAA4spGBbtwvujcopHj4v4wv76wJDAX2bt5xKYdjSA== 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=Lqd5Y9iiVbnHtmNyOMeUtd+VUs0RJjcDM4n9iJSZ1cPTXp1S4Ahj5G4a5HRcnUtXEJnJYbfbvle/AmbBb4gFkEjHuGncs+mbdasas96ZQ0CHhAzB6jBXGfoCmPopB/8udYcVbGYudmsZOuSxGnIhWzNqAICC9q3KUAtS8XmCUxknBWlU1VUzZ2ik67vocGiMuAd1dbSm6YQqvto78EXxxA5QsHowWXSlbvQF2ft7dA9xRcsq0BsIwbrFhTYzHfoCJE4bn0BUiqzLsFdZsB3DBYWYqubrThRZWA8vsmoKELYltQZs+aMTtPrUtysIrpcBMbpcWi/QLST9k3P8H5Q+Hw== 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=k+IPk6YP/JXHWjT5xidQKzOEh6fnumpnXIKtt+CPeD9mEIqtmGWyYBzWaz6j3YsJ1FHYkVqvLd+P+K17IcgsjFUMjdEIuopGtqCEc+Twa44VjKuKl4KBlKHRp/LKfWKqBgBZKGV0GgYQ/uSse7CWFUns0W5S3Ua5ghBxhQyvYeKog+QgwH7D7u/zGh6WiYWC8xruF5FfzDzy4k7f1fRsGgQXSsCbbNTHNJ3FL+uqbr+s2HFqJA4lXalvCCIEgRqxWFn/rQC0tQyK65j+JSd3s2OucrhB8EfmvLmonqlQ/hvKuYs6FaxvC0Hh/TlOJFOsYXQqfNfZqQG3LZCBdGUfVw== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AS4PR03MB8156.eurprd03.prod.outlook.com (2603:10a6:20b:4e3::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4909.7; Wed, 19 Jan 2022 21:19:52 +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.008; Wed, 19 Jan 2022 21:19:52 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 19 Jan 2022 22:19:40 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 X-TMN: [FzQYSaT6x13Ax5gG/F+MY51jdVkMV44y] X-ClientProxiedBy: AM9P195CA0009.EURP195.PROD.OUTLOOK.COM (2603:10a6:20b:21f::14) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220119211945.1070615-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 028b7a14-eff5-430a-b511-08d9db916e74 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiTWvhYxqNXkVg0MddlohE8xaCLXDmBSzDPZygHQACBVDAD5YawpDznKT7NeTyj21mfvOYUt/Rvpa5hR8JwK2nfgoELL675rEVeWVVgjYyNzE8Fb+whuB0xge5rrqxdFHXBPYfzQIIy0myeamRH/M4lNYuqxSBHWbs3cy5cOm3k7vRRTMsuVqSEH2XcFM7ZVPJfdB3MPLtQii0AWAyF8MpWVdpf4//aNZIpDNBaizlz4OosvE1Bkod2X7CogEdlcQEJVqZSCW12thwyYq7FGmlfVPWdhQ2riaE9iPmJMNeX8urNtTO6Nb1/L4BsXUmjSGytNSFp5A2XmKqPqC0Nd7p/xBtJmHenW6Pqi3SG28qh2kPIq6l/ji9m6/jFGOEEFHNe9unTAcJ3yjttMKVXQA8j2tNePSDVPTSbNl/gva/I8yZbBmM6FGOqaSw6XtzLHNa4sjX+vuctM5s1KxSfzVR0Lx0OyBZJtGOIHpPGT1kW6oddp0wgieZVRJK6kytfJAMfrhRdhX7rJF69TUlte+aMVbQKcF+OlMWjXOv/0Qv5GKMnvDTwp/Nw/LpRNBnOxjZLPEmCMSq6NMsWpXM3l1dbjSzKWRf7tzWkbT1q6zb3nwufoiPEhBPiKCACBQWUvuEZdSct5gR8BeKb2pPy0GlvI2x0hbpv+pxcpB212+QdJoUl5R/1w7NofyxWXZX7tr4WBHtLvs+1qiscE52QLlGaigH9w0DuiGsB0vJNena/Qoc+ih9KzRZrUkUF6I5cBLgA= X-MS-TrafficTypeDiagnostic: AS4PR03MB8156:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: QHFM+9drpIb+7QhQoH1AcjU5MjtjVpyQvBsfv12hJgvNNQy1nk3Wi+3FXF57CFstMYIXLRgCxZqSPadFwNaPprd7y17cyNUypmSkki2x9J5V+41sSGWSshsOpsSgs3Ldcienzj7QxUXbSmkV3ptypORUjDJArLxGjAjwHgy6U9La+9DUMq2Gz9Ae/tVYTiGeDtM0Cihp+7IUYLxFSS/71YkKuv8lrUD2ONPrhi+HU7fB43CPLBkdadRn5HVUSUsPKw8uLlJZlydN/5DtP+YkC4z9287AiiJxH+4TZVNcIT95ibOJDQcXFUc3IaE20vtXNgskFafPvKu8Qqa7lUUoJ1GaeHE/3uSFFPIbsMp6jwZ/NopmXQoFF0u3auEJMllP+0LZE3hKixv9ofxWwoeab2/pbDoHzFa1YECoOTLVTbR5KJSI3cSCUm3B/gZ3IZpsYwFAbBhi8LpT6/wiu6PE/sUaFOd++K81m/VUhbdoua5m9f2eoxqkCsRz+dLuyaVbYCP3h9Y5hIfr7WWmK2MCQRlkz11jpxdlU3wYRAd1tm3IRiFKsOyQxz3AIl079dojQZomTulagUgBC4hJW+Q78Q== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 71d0BuBK2XpXLrwKAsBL8F2iRzVcmqbmaOQlCs3ubO8xH4slqKzfEwnIk9k++Z9oB6qKS017QDPzCIShfNq7BMQ982gVNglvx6jix0O1PA4R/C7jrr4ambEFFPXsddeiooSLTn/arbEZS/kqyel1hbmUYZ9wVZPNilKBrZs6g37rXJ4EfROJXcHze7CsDmbueb4xGYJ79czDPB8FScBmy5e71Jg9lQmWeeahjUV4hxPHOkIn9C3/2zAaCM2rppuMzJC9SIXwDm02qyFSZyJfeT0L9CuMxBVERMjgfvM2nkdvlb/lnO+j58VcC8wmiH0k8HSdaQAhwPoGPbuRITOis1peQOd2cW7yb4sOzwxpM1aFrgl3u/12/b7lFf6duPVxasWyLAZUdK2TXeBr5XKRD5Wk0HkUV0KGKY5pIWUbzmatL9hLR1z9gdzsxLVmntUf8rolFCc17zuUPPfVjXaDoy944o/fr+hJ6FPUX/Wet6BiCle1jfRCo71/yqU8vOnl3PlTBeK9rhJROt+UEZ8MF1AOdrYABiKkUHJhWsojP/NbWoFGHG6QN+J8gzAVGKHhxv6k2g+b5/eRodBhjt5e+kZ+e6IjF2SFuN3ZykNgSN7yPmpH2l/ariWC+R+YQDFYpOF3Iu5/lcWhH/0xwlK3+bYIrG8TLd49IbTPGeGXygNL85DcZ6JSTq02856J5Sj1bwAdXnyAmITqbiD2Q1PHHWSODfO78eoI5+FVRiFpcXqud8eDxwvxquXa2rbfl+6pqEwAzPr7iqW4gvb6OEA9YzlJTP/vaCMBSPyCHrPh+omvJ5CkmqS0ybEDq7wR3OTcoFqFLrXVd09oTaUVTPGnT0Q0jRgP4oQtC1nyCJHx+/El+AlkOkYbB6+6U4RtfW97N5GTm3sgs4cKUhWrqwUt+i489pNzmwWE7xHP4FowuCEdcDD0N6cu1sH4b2XMBJl4JoB55u2Ck01upoooZ1/R4Q== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 028b7a14-eff5-430a-b511-08d9db916e74 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Jan 2022 21:19:52.2643 (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: AS4PR03MB8156 Subject: [FFmpeg-devel] [PATCH v2 1/6] 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: WNPh/IiXfHlL 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 "