History

fftools/ffmpeg: make demuxing with one file always blocking

Anton Khirnov committed 4 years ago

Commit 822da7a1 parent c15eb271 file · +3 −2Browse files

Unified · Split

fftools/ffmpeg_demux.c+3−2
@@ -368,8 +368,9 @@ static int thread_start(Demuxer *d) · 367 unmodified lines
368368 if (d->thread_queue_size <= 0)
369369 d->thread_queue_size = (nb_input_files > 1 ? 8 : 1);
370370
371− if (f->ctx->pb ? !f->ctx->pb->seekable :
372− strcmp(f->ctx->iformat->name, "lavfi"))
371+ if (nb_input_files > 1 &&
372+ (f->ctx->pb ? !f->ctx->pb->seekable :
373+ strcmp(f->ctx->iformat->name, "lavfi")))
373374 d->non_blocking = 1;
374375 ret = av_thread_message_queue_alloc(&d->in_thread_queue,
375376 d->thread_queue_size, sizeof(DemuxMsg));

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t