#/******本邮件及其附件含有小米公司的保密信息，仅限于发送给上面地址中列出的个人或群组。禁止任何其他人以任何形式使用（包括但不限于全部或部分地泄露、复制、或散发）本邮件中的信息。如果您错收了本邮件，请您立即电话或邮件通知发件人并删除本邮件！
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 <qiaohaiji...@xiaomi.com>
Date: Tue, 1 Nov 2022 20:29:56 +0800
Subject: [PATCH] libavformat/mux.c: check AVFMT_NOTIMESTAMPS flags.
Signed-off-by: qiaohaijiao1 <qiaohaiji...@xiaomi.com>
Change-Id: I10f7555201b33cbf2e23694446e80c6bd0f4be72
Signed-off-by: qiaohaijiao1 <qiaohaiji...@xiaomi.com>
---
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
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
