From patchwork Wed Nov 2 05:49:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?5LmU5rW35aiH?= X-Patchwork-Id: 39109 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp608284pzb; Tue, 1 Nov 2022 22:49:24 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7/qPo2IUIvowfNWugmDWnVH5A2za6R7fmPpio9p+bJz7n6NsL2sQHXSQzyj2F3LxHBIwkK X-Received: by 2002:a17:907:980e:b0:78d:b6ea:25b3 with SMTP id ji14-20020a170907980e00b0078db6ea25b3mr21529931ejc.98.1667368163745; Tue, 01 Nov 2022 22:49:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667368163; cv=none; d=google.com; s=arc-20160816; b=gnvoS+Wi9o0bfuFVBXcARhFmbR85XWWbriw3S9O30vP23npMzUBhhootl6i6loQdsx ajsrtzHDyEFclyhxxsFCTHSNv8ZLrqOB8dpF/GZx4Nk5aDD6SHK6IQpsZljf5BtHBPsN esa/99oC2B1MCt8XRFC4TQnP0VPZbFIUmVs1YanWIgDlqUwov2a3VAFor+9+sWpfpfFK O/knnf1S5zz0gv00K+KZbHu4VuBtKrhczawqxRfDluN3XT8PNR9z7ZGqo/jhKI8DWm7k 1wCbHhJ4y6TzLIjVXxGsAznF2UdfTT383fFiYygqTAIbimk8hEB5PQy8MBz/CmH4YhLC qJ+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:content-language:accept-language:message-id:date :thread-index:thread-topic:to:from:delivered-to; bh=C+xaJP4seOC3sY/kvni4+0oetAxuj2R8E/e/E8RXU2o=; b=nZ8pqDvLo7vhjijwA9aVKAOKb6NYQy+vS4s5aMmYmB+ShNew+11D2BALM+ucFh6FQD IrfrHg69zYm75mINF7F5Vmbs3j7WYHIDULpwbcE4O3cA9BTvL5HoX3dfioXvkR/qX8QB Ofq9sWD8v18fekxVvxVC59cyqX3hKJCiFRAEXzInvy0dL08HY6gWb7PwEm73LPKFPc6n GsnE0rLjAcgJIvAUOLmJZN6JegzKtLuTQ7G77GqImT+7yTeTxzigtbSIOzZ+pjwtsIJc HCCnlUwqD26ba+VKo+sqXfMrVYh99CpMPx2vBnXsMYg3tgTe6IFeyjzr8JHjINvj5c3E /XxQ== ARC-Authentication-Results: i=1; mx.google.com; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=xiaomi.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id m19-20020aa7d353000000b004619acbc70fsi2544679edr.505.2022.11.01.22.49.22; Tue, 01 Nov 2022 22:49:23 -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; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=xiaomi.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2DBB468BE8E; Wed, 2 Nov 2022 07:49:19 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from outboundhk.mxmail.xiaomi.com (outboundhk.mxmail.xiaomi.com [118.143.206.88]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4174D68BDB0 for ; Wed, 2 Nov 2022 07:49:12 +0200 (EET) X-IronPort-AV: E=Sophos;i="5.95,232,1661788800"; d="scan'208,217,223";a="35976796" Received: from hk-mbx01.mioffice.cn (HELO xiaomi.com) ([10.56.8.121]) by outboundhk.mxmail.xiaomi.com with ESMTP; 02 Nov 2022 13:49:10 +0800 Received: from BJ-MBX04.mioffice.cn (10.237.8.124) by HK-MBX01.mioffice.cn (10.56.8.121) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.29; Wed, 2 Nov 2022 13:49:08 +0800 Received: from BJ-MBX06.mioffice.cn (10.237.8.126) by BJ-MBX04.mioffice.cn (10.237.8.124) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.29; Wed, 2 Nov 2022 13:49:08 +0800 Received: from BJ-MBX06.mioffice.cn ([::1]) by BJ-MBX06.mioffice.cn ([fe80::a46c:5b0f:3b38:ffcf%13]) with mapi id 15.02.0986.029; Wed, 2 Nov 2022 13:49:08 +0800 From: =?eucgb2312_cn?b?x8e6o72/?= To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: libavformat/mux.c: check AVFMT_NOTIMESTAMPS flags. Thread-Index: AQHY7n7MaNkP2mPOdkWoL9x3Gby41A== Date: Wed, 2 Nov 2022 05:49:08 +0000 Message-ID: Accept-Language: zh-CN, en-US Content-Language: zh-CN X-MS-Has-Attach: yes X-MS-TNEF-Correlator: x-originating-ip: [10.237.8.11] MIME-Version: 1.0 X-Content-Filtered-By: Mailman/MimeDel 2.1.29 Subject: [FFmpeg-devel] libavformat/mux.c: check AVFMT_NOTIMESTAMPS flags. 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: mpgvzs27/sJD #/******本邮件及其附件含有小米公司的保密信息，仅限于发送给上面地址中列出的个人或群组。禁止任何其他人以任何形式使用（包括但不限于全部或部分地泄露、复制、或散发）本邮件中的信息。如果您错收了本邮件，请您立即电话或邮件通知发件人并删除本邮件！ This e-mail and its attachments contain confidential information from XIAOMI, which is intended only for the person or entity whose address is listed above. Any use of the information contained herein in any way (including, but not limited to, total or partial disclosure, reproduction, or dissemination) by persons other than the intended recipient(s) is prohibited. If you receive this e-mail in error, please notify the sender by phone or email immediately and delete it!******/# From 5d3708e0c80e0cf720e3bb59e746f490d8c7f39e Mon Sep 17 00:00:00 2001 From: qiaohaijiao1 Date: Tue, 1 Nov 2022 20:29:56 +0800 Subject: [PATCH] libavformat/mux.c: check AVFMT_NOTIMESTAMPS flags. Signed-off-by: qiaohaijiao1 Change-Id: I10f7555201b33cbf2e23694446e80c6bd0f4be72 Signed-off-by: qiaohaijiao1 --- libavformat/mux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/mux.c b/libavformat/mux.c index 5d89458f82..061bf701d6 100644 --- a/libavformat/mux.c +++ b/libavformat/mux.c @@ -1117,7 +1117,7 @@ static int write_packet_common(AVFormatContext *s, AVStream *st, AVPacket *pkt, guess_pkt_duration(s, st, pkt); #if FF_API_COMPUTE_PKT_FIELDS2 - if ((ret = compute_muxer_pkt_fields(s, st, pkt)) < 0 && !(s->oformat->flags & AVFMT_NOTIMESTAMPS)) + if (!(s->oformat->flags & AVFMT_NOTIMESTAMPS) && (ret = compute_muxer_pkt_fields(s, st, pkt)) < 0) return ret; #endif -- 2.25.1