diff options
author | Anton Khirnov <anton@khirnov.net> | 2022-10-17 12:35:22 +0200 |
---|---|---|
committer | Anton Khirnov <anton@khirnov.net> | 2022-10-25 11:04:42 +0200 |
commit | c20977c4e038b7c4b37ddcb300cf13a5881cc724 (patch) | |
tree | 23f22644498ae291f7f4cdf2201fbbe414786fba /fftools/ffmpeg_demux.c | |
parent | 295848bacb120da0fbe74b7f98888c328ac8dd44 (diff) | |
download | ffmpeg-c20977c4e038b7c4b37ddcb300cf13a5881cc724.tar.gz |
fftools/ffmpeg: drop free_input_threads()
Stop demuxer threads in ifile_close() instead. Simplifies the demuxer
API.
Diffstat (limited to 'fftools/ffmpeg_demux.c')
-rw-r--r-- | fftools/ffmpeg_demux.c | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/fftools/ffmpeg_demux.c b/fftools/ffmpeg_demux.c index 880e56d2e3..f94a901d05 100644 --- a/fftools/ffmpeg_demux.c +++ b/fftools/ffmpeg_demux.c @@ -322,12 +322,12 @@ finish: return NULL; } -static void free_input_thread(int i) +static void thread_stop(Demuxer *d) { - InputFile *f = input_files[i]; + InputFile *f = &d->f; DemuxMsg msg; - if (!f || !f->in_thread_queue) + if (!f->in_thread_queue) return; av_thread_message_queue_set_err_send(f->in_thread_queue, AVERROR_EOF); while (av_thread_message_queue_recv(f->in_thread_queue, &msg, 0) >= 0) @@ -338,14 +338,6 @@ static void free_input_thread(int i) av_thread_message_queue_free(&f->audio_duration_queue); } -void free_input_threads(void) -{ - int i; - - for (i = 0; i < nb_input_files; i++) - free_input_thread(i); -} - static int thread_start(Demuxer *d) { int ret; @@ -442,10 +434,13 @@ int ifile_get_packet(InputFile *f, AVPacket **pkt) void ifile_close(InputFile **pf) { InputFile *f = *pf; + Demuxer *d = demuxer_from_ifile(f); if (!f) return; + thread_stop(d); + avformat_close_input(&f->ctx); av_freep(pf); |