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 B2A9549A28 for ; Mon, 27 May 2024 15:22:24 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6774D68D4E1; Mon, 27 May 2024 18:22:21 +0300 (EEST) Received: from ursule.remlab.net (vps-a2bccee9.vps.ovh.net [51.75.19.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BFB3D68D403 for ; Mon, 27 May 2024 18:22:14 +0300 (EEST) Received: from basile.remlab.net (localhost [IPv6:::1]) by ursule.remlab.net (Postfix) with ESMTP id EDD61C0069 for ; Mon, 27 May 2024 18:22:13 +0300 (EEST) From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= To: ffmpeg-devel@ffmpeg.org Date: Mon, 27 May 2024 18:22:13 +0300 Message-ID: <20240527152213.259504-1-remi@remlab.net> X-Mailer: git-send-email 2.45.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] Revert "avformat/file: seek back to initial position for fd protocol" 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 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: The generally expected behaviour is for software to append from the current position, not to keep resetting. See also how shell works: # (foo && bar) > file ...would normally concatenate the output of both commands to file. If foo seeks like lavf, bar would instead overwrite the output of foo (possibly not completely). This reverts commit 5c3d2177e7be7dde69a83b1b394f57976c164c84. --- libavformat/file.c | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/libavformat/file.c b/libavformat/file.c index 0ed4cff266..3fc1e741f2 100644 --- a/libavformat/file.c +++ b/libavformat/file.c @@ -99,7 +99,6 @@ typedef struct FileContext { #if HAVE_DIRENT_H DIR *dir; #endif - int64_t initial_pos; } FileContext; static const AVOption file_options[] = { @@ -220,12 +219,7 @@ static int fd_dup(URLContext *h, int oldfd) static int file_close(URLContext *h) { FileContext *c = h->priv_data; - int ret; - - if (c->initial_pos >= 0 && !h->is_streamed) - lseek(c->fd, c->initial_pos, SEEK_SET); - - ret = close(c->fd); + int ret = close(c->fd); return (ret == -1) ? AVERROR(errno) : 0; } @@ -293,7 +287,6 @@ static int file_open(URLContext *h, const char *filename, int flags) av_strstart(filename, "file:", &filename); - c->initial_pos = -1; if (flags & AVIO_FLAG_WRITE && flags & AVIO_FLAG_READ) { access = O_CREAT | O_RDWR; if (c->trunc) @@ -505,11 +498,6 @@ static int fd_open(URLContext *h, const char *filename, int flags) if (c->fd == -1) return AVERROR(errno); - if (h->is_streamed) - c->initial_pos = -1; - else - c->initial_pos = lseek(c->fd, 0, SEEK_CUR); - return 0; } -- 2.45.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".