[FFmpeg-cvslog] fftools/ffmpeg_demux: don't flag timestamps as unreliable if they are generated
James Almer
git at videolan.org
Thu Jul 10 17:18:27 EEST 2025
ffmpeg | branch: release/7.0 | James Almer <jamrial at gmail.com> | Tue Jul 8 15:00:29 2025 -0300| [2e503a9b94e2f499791a6fa9172018f61ba3d44a] | committer: James Almer
fftools/ffmpeg_demux: don't flag timestamps as unreliable if they are generated
Regardless of the source being an AVFMT_NOTIMESTAMPS format, if the timestamps
are generated like when using the use_wallclock_as_timestamps demuxer option,
then they are reliable.
Fixes ticket #11268
Signed-off-by: James Almer <jamrial at gmail.com>
(cherry picked from commit 1787fade209b1ecbd4b911c9d77a52bcdec13fa6)
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2e503a9b94e2f499791a6fa9172018f61ba3d44a
---
fftools/ffmpeg_demux.c | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/fftools/ffmpeg_demux.c b/fftools/ffmpeg_demux.c
index 47312c9fe1..c6b8af8909 100644
--- a/fftools/ffmpeg_demux.c
+++ b/fftools/ffmpeg_demux.c
@@ -907,9 +907,18 @@ static int ist_use(InputStream *ist, int decoding_needed)
if (decoding_needed && ds->sch_idx_dec < 0) {
int is_audio = ist->st->codecpar->codec_type == AVMEDIA_TYPE_AUDIO;
+ int is_unreliable = !!(d->f.ctx->iformat->flags & AVFMT_NOTIMESTAMPS);
+ int64_t use_wallclock_as_timestamps;
+
+ ret = av_opt_get_int(d->f.ctx, "use_wallclock_as_timestamps", 0, &use_wallclock_as_timestamps);
+ if (ret < 0)
+ return ret;
+
+ if (use_wallclock_as_timestamps)
+ is_unreliable = 0;
ds->dec_opts.flags = (!!ist->fix_sub_duration * DECODER_FLAG_FIX_SUB_DURATION) |
- (!!(d->f.ctx->iformat->flags & AVFMT_NOTIMESTAMPS) * DECODER_FLAG_TS_UNRELIABLE) |
+ (!!is_unreliable * DECODER_FLAG_TS_UNRELIABLE) |
(!!(d->loop && is_audio) * DECODER_FLAG_SEND_END_TS)
#if FFMPEG_OPT_TOP
| ((ist->top_field_first >= 0) * DECODER_FLAG_TOP_FIELD_FIRST)
More information about the ffmpeg-cvslog
mailing list