This is an automated email from the git hooks/post-receive script.
Git pushed a commit to branch master
in repository ffmpeg.
The following commit(s) were added to refs/heads/master by this push:
new 70a5df6d27 fftools: fix manual merge missing changes
70a5df6d27 is described below
commit 70a5df6d274400b186a1166551be3aa304b1d195
Author: Romain Beauxis <[email protected]>
AuthorDate: Sat Jul 18 12:06:05 2026 -0500
Commit: Romain Beauxis <[email protected]>
CommitDate: Sat Jul 18 12:06:36 2026 -0500
fftools: fix manual merge missing changes
Signed-off-by: Romain Beauxis <[email protected]>
---
fftools/ffmpeg_demux.c | 2 +-
fftools/ffmpeg_mux_init.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/fftools/ffmpeg_demux.c b/fftools/ffmpeg_demux.c
index 0d8ccf21ee..8ae5486582 100644
--- a/fftools/ffmpeg_demux.c
+++ b/fftools/ffmpeg_demux.c
@@ -2289,7 +2289,7 @@ int ifile_open(const OptionsContext *o, const char
*filename, Scheduler *sch)
}
}
- if (recording_time != INT64_MAX && recording_time < 0) {
+ if (recording_time < 0) {
av_log(d, AV_LOG_ERROR, "-t value must be non-negative; aborting.\n");
return AVERROR(EINVAL);
}
diff --git a/fftools/ffmpeg_mux_init.c b/fftools/ffmpeg_mux_init.c
index 79fde4d7ab..286d3a205d 100644
--- a/fftools/ffmpeg_mux_init.c
+++ b/fftools/ffmpeg_mux_init.c
@@ -3492,7 +3492,7 @@ int of_open(const OptionsContext *o, const char
*filename, Scheduler *sch)
}
}
- if (recording_time != INT64_MAX && recording_time < 0) {
+ if (recording_time < 0) {
av_log(mux, AV_LOG_ERROR, "-t value must be non-negative;
aborting.\n");
return AVERROR(EINVAL);
}
_______________________________________________
ffmpeg-cvslog mailing list -- [email protected]
To unsubscribe send an email to [email protected]
