RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Revert "avformat/file: seek back to initial position for fd protocol" 

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 5c3d2177e7.
This commit is contained in:
Rémi Denis-Courmont 2024-05-27 18:19:42 +03:00
parent 6de951923b
commit add8c46215
1 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libavformat/file.c
View File

@ -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;
}