From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 8FAB94A5D5 for ; Sun, 31 Mar 2024 11:40:29 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DEE6368CB28; Sun, 31 Mar 2024 14:40:26 +0300 (EEST) Received: from relay3-d.mail.gandi.net (relay3-d.mail.gandi.net [217.70.183.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C17C768CABD for ; Sun, 31 Mar 2024 14:40:20 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 223E060002 for ; Sun, 31 Mar 2024 11:40:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1711885220; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=QRlYiNvP4HnzfhGSYH5N8ts0VX++uKPCfudkQ4f8waE=; b=gTb1Z3EUHZSWykRgVxr+dBC+nydNCoGQK4iUDwzqSd/1XGIy49Xn8T/7xtPXlrrQE79kFf hx1lsiBJ0iVicaohiJOnY5/GrbHeuhkdyhORMuNemVBS4en/Fp43u8OPVd2DhFxLWP1gqt K695TB+uX7xW+CjYV3oh1HYfX3+0zSwXpIBqdUUAjMTCqW3dXPJ9ZbUWipyXKhwD/nwSfP ygI/k1Wozc7ngS8o4vz/v2Ij5ybLorbvNfBtCRTOsH/YhgOMwd2/oc1m1UbrdLmsxWoFIi 1W7mlmLdUvrqlxnNhO9lU2SXx67qhymuMHKzLyC7xjBh4D+c4E6LJE4Ak434ig== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 31 Mar 2024 13:40:19 +0200 Message-Id: <20240331114019.3801-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH] avformat/movenc: Check that cts fits in 32bit 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 MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Fixes: Assertion av_rescale_rnd(start_dts, mov->movie_timescale, track->timescale, AV_ROUND_DOWN) <= 0 failed at libavformat/movenc.c:3694 Fixes: poc2 Found-by: Wang Dawei and Zhou Geng, from Zhongguancun Laboratory Signed-off-by: Michael Niedermayer --- libavformat/movenc.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index ae94d8d5959..5617a2620c5 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -6194,6 +6194,12 @@ int ff_mov_write_packet(AVFormatContext *s, AVPacket *pkt) if (ret < 0) return ret; + if (pkt->pts != AV_NOPTS_VALUE && + (uint64_t)pkt->dts - pkt->pts != (int32_t)((uint64_t)pkt->dts - pkt->pts)) { + av_log(s, AV_LOG_WARNING, "pts/dts pair unsupported\n"); + return AVERROR_PATCHWELCOME; + } + if (mov->flags & FF_MOV_FLAG_FRAGMENT || mov->mode == MODE_AVIF) { int ret; if (mov->moov_written || mov->flags & FF_MOV_FLAG_EMPTY_MOOV) { -- 2.17.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-request@ffmpeg.org with subject "unsubscribe".