From patchwork Thu Apr 12 08:20:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hendrik Leppkes X-Patchwork-Id: 8416 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.1.70 with SMTP id c67csp1627159jad; Thu, 12 Apr 2018 01:20:49 -0700 (PDT) X-Google-Smtp-Source: AIpwx49im3puT/bgtg15dd+LN/JnfjlpE0BFLDeW++7ER/SPrB5aJCAh84/tQl9hdPqcFlthxxQg X-Received: by 10.223.185.114 with SMTP id b47mr5467204wrg.238.1523521249270; Thu, 12 Apr 2018 01:20:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1523521249; cv=none; d=google.com; s=arc-20160816; b=OxJedDtGemmIUysCOto2F/3gcJ072rwneHvhBK2zAewIH5E2lMsqCchfIn9ewqZBfn Kq/b9hXnkkLQK1dEpnGN21TLWj/4EuC13nRJm47jcRxZWlpSjFMJ9tJME8xoo3T7YMTq NpSgfHGK74O4ZKtkeVVyWcQfklkG8fvKe/enkO6Kb0pHsZ/8a3jj78H0IJmHvkLV+42K Imjsl+U14FHfBV0lI86l5e0jxTxlTqz6kUtdlOwpJHSvqaatmwPM92wnp9vhb/mlACou 7mB4MBvCeaHxAXIy78CVTj+FJlottD9dp9Vrx/MLUeUTKDXzHBc721pt9sGgKilvVyAD efag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=YJ9rx/MNNOFa1/pZ02k+jVn/Qd31RTlv8ClPToZAyko=; b=qpMQOYE5W6+PFBTi9YrCs8YC+qsE/nkP4oDqX5iiTYOlt8U8i1839Cpe+jgxY/EaD5 EhLiMiy++s9pc4eU4U3nPvN/SQYu5Pb35caL59GudNX/0Lwq+OGGvfyRkc2Drp5BcgL2 TbOoRm+ErGVxvR0iKWokDa18f1c9fbeH0GKt/F9KOdz4BWQxLKNISjHApB1INsCRUYTQ NcLIbVqF65pfwtxWAbbJxBr0L26iWS7Hlky92oFsuV+JM3aFZ0GSdoGEmQvrT0tOfYcz PHCTvHk8UkMeSy+Y8qncKX8t888xZqKSUXpRwsJrPWlaOCak4nBnGwZPWUYYGYt8vgoJ kXCQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=C7QKPa6B; 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=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id b193si2170494wmd.13.2018.04.12.01.20.48; Thu, 12 Apr 2018 01:20:49 -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=@gmail.com header.s=20161025 header.b=C7QKPa6B; 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=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9D23068A357; Thu, 12 Apr 2018 11:20:22 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f180.google.com (mail-wr0-f180.google.com [209.85.128.180]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 70EDF68A34C for ; Thu, 12 Apr 2018 11:20:16 +0300 (EEST) Received: by mail-wr0-f180.google.com with SMTP id l13so3148574wrb.5 for ; Thu, 12 Apr 2018 01:20:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=JIcSGxD+6WPknhD875eD2SeJ/qlDVnb9QadYH6RilkA=; b=C7QKPa6BcMIBCvpusNrhhzMDsUtNZyaVEgpFmsUtoB1c56H6FGGMldyVE/7f6/EvkI m1r/aRjgtwXxJUJFfD7FFKbrN5zlKDBQSLMnzDnUXAQvgyUX20OSgMswyYISmvPga85v hVNn0JYu9KIMc+ezytKuem2M0fUl5ZtI95wf9u3POZV7WcsAO0nnSbdp80cGzivqLa4e SLqfTatBFW+AapBkVDSvpdci/Z+4rfuVnHi8/sAMwO0tDASwuad7/SuUFu+1B9uPk0rW PrnH7kIk/HyWaysIKbqr22NN4f/IsZCiXnq70+SetVXJsaLcdiv2f44dkoh42V/TWgC5 zXYg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=JIcSGxD+6WPknhD875eD2SeJ/qlDVnb9QadYH6RilkA=; b=NXxzn73MRwn8NxeZsWqEgSzr0BrP6fU+RIkZIi/c3snjzrpdZTEjJWWEM51YvL8mJF 0HI1c8NzbLMJUgqs4pvotUltHyIzT11OrYOQOz8aj4c2W1UOdAL5CBvzgq9c+fFx8naA lmXnePctDiQ/4YYmjL0B7ZFIc6avZObc8dNVxa6xa1zb3HHguYRNtAWWxyFpQt3WjwO8 KMfCvbcSxxhrocrWgcIADD4UNQG1E2FZjZgKzLJ4oDHCvsHkIxKeLiAZlzJoCkQKm8F8 tvZqAnnn9mg/17SAbdhnhdjP+y3iayu2+bRmAZFzRM3KV/LEPgOfTmwjkQ7OXGXdcER7 SJtg== X-Gm-Message-State: ALQs6tCrMUCGAWe9l++O85ygs8obumMszXcVB/qzxBNq+o9fju8vN8/9 4rk5PQ0lMtHLLQduim4h6mSNRsDB X-Received: by 10.223.227.73 with SMTP id n9mr1559345wrj.134.1523521240259; Thu, 12 Apr 2018 01:20:40 -0700 (PDT) Received: from localhost (p4FC4F922.dip0.t-ipconnect.de. [79.196.249.34]) by smtp.gmail.com with ESMTPSA id 62sm3564837wrg.34.2018.04.12.01.20.39 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Apr 2018 01:20:39 -0700 (PDT) From: Hendrik Leppkes To: ffmpeg-devel@ffmpeg.org Date: Thu, 12 Apr 2018 10:20:38 +0200 Message-Id: <20180412082038.12100-1-h.leppkes@gmail.com> X-Mailer: git-send-email 2.16.1.windows.4 Subject: [FFmpeg-devel] [PATCH] avformat/mux: ignore invalid timestamps on formats without timestamps X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- libavformat/mux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/mux.c b/libavformat/mux.c index a13f0e3a1b..0857419394 100644 --- a/libavformat/mux.c +++ b/libavformat/mux.c @@ -615,7 +615,7 @@ static int compute_muxer_pkt_fields(AVFormatContext *s, AVStream *st, AVPacket * } if (st->cur_dts && st->cur_dts != AV_NOPTS_VALUE && - ((!(s->oformat->flags & AVFMT_TS_NONSTRICT) && + ((!(s->oformat->flags & (AVFMT_TS_NONSTRICT|AVFMT_NOTIMESTAMPS)) && st->codecpar->codec_type != AVMEDIA_TYPE_SUBTITLE && st->codecpar->codec_type != AVMEDIA_TYPE_DATA && st->cur_dts >= pkt->dts) || st->cur_dts > pkt->dts)) {