From patchwork Mon Sep 16 18:22:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?RmlsaXAgTWHFoWnEhw==?= X-Patchwork-Id: 51623 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:9fc3:0:b0:48e:c0f8:d0de with SMTP id k3csp1530515vqy; Mon, 16 Sep 2024 11:25:53 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUGL7RYfmlAAJPRo5/0knBcWNmTwV+Sl0LgodRuHKnaYAereUmTiMXC5uEZaEsif+1r+Zr4Sd2Mo0M27O6tS2DD@gmail.com X-Google-Smtp-Source: AGHT+IG36v7PFvbOc05OjSIU1tnVSBvIEWpdZzAoN20QGJptBd3AgUTC8WtGR1qo1GJHhxsTflUW X-Received: by 2002:a17:907:e213:b0:a8d:4631:83b0 with SMTP id a640c23a62f3a-a90293f8e92mr1502386666b.5.1726511153252; Mon, 16 Sep 2024 11:25:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1726511153; cv=none; d=google.com; s=arc-20240605; b=DlqpoG5COwenCAGuP3InUgBDZmtUkBYt3nvsG6xOSllH9/BRXvUidsYHa3Y2PLKBgI DsfOptAnDBjE+wpX2eMNTz+UHp0L+OWHLdw/yf77MXlr/7nCvgA+oI5zEUquTi9usjbM mO0/vwHdN2/eAwyUYHotjnlOGwjLRLjxREO+DD+T81/Ju+k5KASAdVYNGOcXP/0H/HfQ M8AOAqtz+4iBAXI55hUHVbhBudxAJRPyRlcx1gFXfMsL7F4Sngd3MtmkCWd4/8LsdTho DbmxjottD5eVjgSc5ym8ZU3h8HwWAd1S6RgNMQwLI2RboYUTPHEWZjrQheA72XHkF5lI JvWg== 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:message-id:date:to:from :dkim-signature:delivered-to; bh=Kuech39DXH0nplCUuhyM15pMrdvZbZaVqChpbFn+C+o=; fh=vUG20E56bhII0xGyaMwCR+cO1JMOl7NOj4ka3/90tN8=; b=KsFIz8WM7RzxYyYxeiIzjMdDjnZ31zw8A4tNP+CO/J/rcev9xAWmeejGCkAr+MO88K zE7jNCpkXw+9wrcghIjKlgUKzcb0gN4VLTcRTbMJBsZ/gsf4Tc28mOyNl/yNjW0v+v+k 7YZF/qPK8R8d49X+xEFzE7IV4GJNXeR1c26QE3SQj/IyezyYRYnicCj5BtCqbQJy9WeB fqCST/Yxw2ppkXNLnvpG2Q53PUGOcpiW/kJjRoEB7LOemkJMILlIB/HGHxeqB5grfsOM H52WPLIET1PY/xBkKii6C9e8w9NmnhZOFey1TLLauqkjAb7VzJdCdcI7X8JPNRwvuvOB 3UYQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=NqvKia5D; 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; dara=fail header.i=@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 a640c23a62f3a-a90610f668csi405504766b.260.2024.09.16.11.25.52; Mon, 16 Sep 2024 11:25:53 -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=20230601 header.b=NqvKia5D; 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; dara=fail header.i=@gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 876B168DBB3; Mon, 16 Sep 2024 21:25:49 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5F35B68D7CA for ; Mon, 16 Sep 2024 21:25:43 +0300 (EEST) Received: by mail-wm1-f41.google.com with SMTP id 5b1f17b1804b1-42cae6bb895so47625665e9.1 for ; Mon, 16 Sep 2024 11:25:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1726511142; x=1727115942; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=kJu03+DIMl3KaqboKq2jYfXa516MISxRmXr2cmbVpDk=; b=NqvKia5D8SkDNRAy/tUTS0Fz9m3ooKXD9uojnxyz1kMb+egaSK7zCz/6hrpMQtz/Mc oBW68XtSPjG+5pOaeC13ahY5iurh0aNC0Hh9dLIDcve/PB3fHR4cmO9DxrL9FIw6GvLL MdAysZpjLeEuyQlaT2/p9ZqExbEL2Npz6UuXcuk0rH9RvBGKABj/6maQ+Fe17PdSAr1S WcFf59HXRAYP8qKudnvlzcvP97KZr+t3zoDeB5lxUYYsL/oXWs6YchXdtcWZ+nYYAdEj 8/MZmfT8RjPJXfo2y8XQEkQG6RAesgGfLYWjn2YcPDDfvlyY9/5g+jUP5xB1cktgRXan yv+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1726511142; x=1727115942; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=kJu03+DIMl3KaqboKq2jYfXa516MISxRmXr2cmbVpDk=; b=w+PRNZYVqxMj3D1ae2AXbBevDoayswctXVZ3x4tuB2Gm5ewskjisfK3eyJjuZmjqNc lYYApGWqD62Q2BZljhIIQFx7Xl6SKal5bEygSY6aXzYHk8DBKe/pae07DGZtV9MykNX9 9vcjv3YqDplV5zBhRBQCeARROMUhIorY/QGRinfIRYiyQClJ8xQFS/H1/0PaVrkkQ4JI rG7eGhlVDZUdWbexHXFAiYYIZBeKQtQTK3F8CKa5ZY8QXrrxfrKYeRtsfq6REydnLMbZ 52gmxx0AsTE+aezPnDOnwbgJT/Hpc+qbfNphskz80kLHu5B53hsP4TW1M/kqs7OBsczq J70A== X-Gm-Message-State: AOJu0YwGLTLQqa9O4Otg2hhyBKHjsi8IXK4uRo04bAYuabCevTa215Ub 4CItCP5C+7B4j9FSZAFSLHlE/NBPKO3wQt9IM65sk9HoIwYUTaDS7ncSpw== X-Received: by 2002:a05:600c:5246:b0:426:627e:37af with SMTP id 5b1f17b1804b1-42cdb538c6dmr123357835e9.3.1726511141513; Mon, 16 Sep 2024 11:25:41 -0700 (PDT) Received: from localhost.localdomain ([2a02:6b6f:f685:d300:49f8:c711:61f8:d69e]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-378e71f051esm7838321f8f.12.2024.09.16.11.25.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Sep 2024 11:25:41 -0700 (PDT) From: =?utf-8?b?RmlsaXAgTWHFoWnEhw==?= To: ffmpeg-devel@ffmpeg.org Date: Mon, 16 Sep 2024 19:22:35 +0100 Message-ID: <20240916182420.188-3-shoutplenty@gmail.com> X-Mailer: git-send-email 2.46.0.windows.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] av_get_frame_filename2 parameter int -> int64_t 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: =?utf-8?b?RmlsaXAgTWHFoWnEhw==?= Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 3N1lPf2quCJj my apologies for re-sending; i didn't spot that there was a header file. my previous email may be disregarded. suggested fix for ticket 11194; see ticket for more info. i haven't been able to test this since i don't have any build tools installed, but decided to submit it since it seems to be a trivial change and easy to test Signed-off-by: Filip Mašić --- libavformat/avformat.h | 4 ++-- libavformat/utils.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 4a3fb00529..76ffb008b4 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -2911,10 +2911,10 @@ void av_dump_format(AVFormatContext *ic, * @return 0 if OK, -1 on format error */ int av_get_frame_filename2(char *buf, int buf_size, - const char *path, int number, int flags); + const char *path, int64_t number, int flags); int av_get_frame_filename(char *buf, int buf_size, - const char *path, int number); + const char *path, int64_t number); /** * Check whether filename actually is a numbered sequence generator. diff --git a/libavformat/utils.c b/libavformat/utils.c index e9ded627ad..41acc71949 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -280,7 +280,7 @@ uint64_t ff_parse_ntp_time(uint64_t ntp_ts) return (sec * 1000000) + usec; } -int av_get_frame_filename2(char *buf, int buf_size, const char *path, int number, int flags) +int av_get_frame_filename2(char *buf, int buf_size, const char *path, int64_t number, int flags) { const char *p; char *q, buf1[20], c; @@ -338,7 +338,7 @@ fail: return -1; } -int av_get_frame_filename(char *buf, int buf_size, const char *path, int number) +int av_get_frame_filename(char *buf, int buf_size, const char *path, int64_t number) { return av_get_frame_filename2(buf, buf_size, path, number, 0); }