From patchwork Mon Sep 23 16:16:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 51769 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:d154:0:b0:48e:c0f8:d0de with SMTP id bt20csp2574699vqb; Mon, 23 Sep 2024 09:24:17 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXAjwFtVrroPTVhjlooYRRH1yYx/0nM/Io7NE6KyRoOO+ZWiFdsSaRtmtJBcC5Osz3ZULyX44WZvpXki5GfUT56@gmail.com X-Google-Smtp-Source: AGHT+IFG35hLV6b3nfelROp+7+ESDeM+LTYwYTeJt+rdtSzer3AT7NH8VcHfxxYl+ipDiCE4Seqw X-Received: by 2002:a17:907:3d87:b0:a86:7b71:7b74 with SMTP id a640c23a62f3a-a90d58ceaadmr1493766566b.55.1727108656984; Mon, 23 Sep 2024 09:24:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1727108656; cv=none; d=google.com; s=arc-20240605; b=bw2zwCcITjlTNnivc5A0Zp61nAAd2wNIMCPaNJ0as0D0xrHJIwBOEwWyuilwYFIdU/ qAZEIllPJwq1OpRHp/QO33RLhjx1tOZR/LxktPmRR+GCTHzLf9QMyhPIelhj48gnB9Wx oP3sed3iPX6cICNAaMR8f8OHEhRciLDe2fGtcTZESTjMAG8F/vwJyTnLlMXnGbGrfXt4 H1VOwQ63utwRmKcnOlV8qBBrtE+mjlb3YXcXvyyo/IzERcAHZbyJRp2M6YJIOx+T/I8y keezcSh0f0HKVJTDn8ySGNsCjH8A7J4qPPyTcJERnrpG7FTcIUf1FzuV0qI66DFqnILs ZeuA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:date:to:from:message-id :dkim-signature:delivered-to; bh=dlkAK+Betk0fhYlMCs/e9I8qiNuRcTBRrO3agJauqHs=; fh=HnHYuZ9XgUo86ZRXTLWWmQxhslYEI9B9taZ5X1DLFfc=; b=S1Q1coOtRkiV30Az4UhgZUFzsa+Lbccpw2Oiq3mjZ1nhuVbZqcO8xP2NHGQ5JxHn+x P46zHxtUpgO6UhsObBJtAmAWs0tv+eoa49vdSTRIacYlwAPKGmQdCl2aoJdEZa9Vn9ug ttEXMbBlpO8irnOZgzLD6K78YXTaX1+qPHHrON/8pbMHyctDx8StBD+SpHUD53dyS42/ CzCx/I1/LivIWRxAi10LD63ry2mpalsLItj0TbTy2eGFcUs2FkHAyhKMVfTEyO1eA2XM PWozEukRrbicTn9s88N432zv/WMTmRuLNQHuOodJTHSpYWD98ZqNiht5GxiZ/GfuktGE FQLQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=uX8SSZ5t; 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=NONE dis=NONE) header.from=foxmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a640c23a62f3a-a9061335e02si1356961366b.762.2024.09.23.09.24.16; Mon, 23 Sep 2024 09:24:16 -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=@foxmail.com header.s=s201512 header.b=uX8SSZ5t; 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=NONE dis=NONE) header.from=foxmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A263A68DAD6; Mon, 23 Sep 2024 19:16:39 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out162-62-57-49.mail.qq.com (out162-62-57-49.mail.qq.com [162.62.57.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8460A68DA1B for ; Mon, 23 Sep 2024 19:16:32 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1727108183; bh=TIMp3tzQ9ZhmIez1u4bMnnuMNU4/4ZzRE6AsRwrYD74=; h=From:To:Cc:Subject:Date; b=uX8SSZ5tVa/c65HiZDiAp48/REKeeVWTs8VaLRUvWd3OIkH+522Ecul7Og2EDEz/E nRDgHTkWAB1vhbiLVqV8F+wXRo2zuTkY2umcubV3JPriXnQSPDEHqB4HF9hKQChliu R8qZPiybNVy8PSZoOAOIPEkVyLmWmmKTTRW9kp80= Received: from ZHILIZHAO-MB1.tencent.com ([113.116.30.244]) by newxmesmtplogicsvrsza29-0.qq.com (NewEsmtp) with SMTP id 40E244DA; Tue, 24 Sep 2024 00:16:14 +0800 X-QQ-mid: xmsmtpt1727108174tk97bsufo Message-ID: X-QQ-XMAILINFO: NvH2zBBgt3uTwffz0RAPyBBJPKNPrZ1ngA5H0KUC1c+2oU+mlTPLboSf3kd/Pz nCuh6pKnLUGkBt0AnDljRtY5wnOwF4/SK1kZPmvOZg6VB8+g4e4EwTsz5vKhTy5UhUYWGPrR/83i 2B2RhhfmWfqb0PqB+uIQTNaUZAmoV2rPoCShtjE8vYwMMTtKR3oAjZFb7q6UlEJByaAy1C8NK0P9 Nj/j2YyAGEmvP/h7ENv+mgn9YQq6ADfZrvoNzP8lBu+cK6fzCp2hjc8ev3Eg58OyvUjfSJx65HSt V0Y6p4dR3GTbgvzN6j4/RQFvPqy+7k1oINC77q3rUoVmKspBdEiNpP3qV8wlJzgxlWemVI8jbXDT dK9dKU9CAYabFv/QxTTIohdRBQ8vBkrhrLjaYFEbbJ/XKcG+512q6tfLSgY0jh3o4iyHgac+ktqE BVQOa0u7O44//qaZzGTNycMrXO9p5CYwL8IOzd9QjHtQGPBYXNkg9FFPYjqoX29iEwQyAI+DuLKd YtuZvqiA50VTTHlVN83GHwMrItdaXEFyx+Ampr/BXkT/W9PeRoZj8EGyzreIk4p0rRjm6RFUq3HV 2Kaj3z34Kw4qxCCw8yESWLpZaLdqnL/rRHp8VRWGQXyO2iTtO5mXv22hNmPZekyoS7SBIwTJFHMF pzW/1ulYrFWewRuEELa0WTg7KGY3nl4avdnHPqTmn3L6szVCULT9Qasr8C/S73EUSElyLSaPsKtA XyN7tnxugo099QSY9KoKXhxxy5aW2yiRyiI8Dtayb41XAkzcmTCgNKjouUHYVry99eRbGZcuxre+ tBOip5HAn+i4QrC1b91VOpGzyZWSlFsci4RrDTbZI0moI+x7n5upaz3erxEQ6q6Gk4DRPlKmFyTP kBFL9O1ai9vsvsI+JCi+wQAbXG9jb9WTyDa5xqe2NMzzzQ2fU8YLpQBKlL60f29Uy5CZ1E7YPE0G LUEaFMt88T7wu8M3Sdhw2kMo74VQyOphn+DUe9v5M= X-QQ-XMRINFO: NS+P29fieYNw95Bth2bWPxk= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Tue, 24 Sep 2024 00:16:13 +0800 X-OQ-MSGID: <20240923161613.95883-1-quinkblack@foxmail.com> X-Mailer: git-send-email 2.46.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 2/2] avformat/img2enc: Fix integer truncation when frame_pts is enabled 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: Zhao Zhili Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: ikFIQNUGORgK From: Zhao Zhili --- libavformat/img2enc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavformat/img2enc.c b/libavformat/img2enc.c index 526a11e5ee..41638d92b8 100644 --- a/libavformat/img2enc.c +++ b/libavformat/img2enc.c @@ -160,13 +160,13 @@ static int write_packet(AVFormatContext *s, AVPacket *pkt) return AVERROR(EINVAL); } } else if (img->frame_pts) { - if (av_get_frame_filename2(filename, sizeof(filename), s->url, pkt->pts, AV_FRAME_FILENAME_FLAGS_MULTIPLE) < 0) { + if (ff_get_frame_filename(filename, sizeof(filename), s->url, pkt->pts, AV_FRAME_FILENAME_FLAGS_MULTIPLE) < 0) { av_log(s, AV_LOG_ERROR, "Cannot write filename by pts of the frames."); return AVERROR(EINVAL); } - } else if (av_get_frame_filename2(filename, sizeof(filename), s->url, - img->img_number, - AV_FRAME_FILENAME_FLAGS_MULTIPLE) < 0) { + } else if (ff_get_frame_filename(filename, sizeof(filename), s->url, + img->img_number, + AV_FRAME_FILENAME_FLAGS_MULTIPLE) < 0) { if (img->img_number == img->start_img_number) { av_log(s, AV_LOG_WARNING, "The specified filename '%s' does not contain an image sequence pattern or a pattern is invalid.\n", s->url); av_log(s, AV_LOG_WARNING,