[FFmpeg-cvslog] fftools/ffmpeg: make demuxing with one file always blocking

Anton Khirnov git at videolan.org
Wed Nov 16 09:43:50 EET 2022


ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Tue Nov  8 12:07:11 2022 +0100| [822da7a31746b8a5ec92c854b52bc767e6e98e8a] | committer: Anton Khirnov

fftools/ffmpeg: make demuxing with one file always blocking

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=822da7a31746b8a5ec92c854b52bc767e6e98e8a
---

 fftools/ffmpeg_demux.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/fftools/ffmpeg_demux.c b/fftools/ffmpeg_demux.c
index 94fd604fd9..b3eb8c66cc 100644
--- a/fftools/ffmpeg_demux.c
+++ b/fftools/ffmpeg_demux.c
@@ -368,8 +368,9 @@ static int thread_start(Demuxer *d)
     if (d->thread_queue_size <= 0)
         d->thread_queue_size = (nb_input_files > 1 ? 8 : 1);
 
-    if (f->ctx->pb ? !f->ctx->pb->seekable :
-        strcmp(f->ctx->iformat->name, "lavfi"))
+    if (nb_input_files > 1 &&
+        (f->ctx->pb ? !f->ctx->pb->seekable :
+         strcmp(f->ctx->iformat->name, "lavfi")))
         d->non_blocking = 1;
     ret = av_thread_message_queue_alloc(&d->in_thread_queue,
                                         d->thread_queue_size, sizeof(DemuxMsg));



More information about the ffmpeg-cvslog mailing list