Message ID | 20220803135844.16662-15-anton@khirnov.net |
---|---|
State | Accepted |
Commit | c3b8d59d2f40550369dbfb2505f2f8415f1e37ec |
Headers | show |
Series | [FFmpeg-devel,01/25] fftools/ffmpeg_opt: move adding attachments out of open_output_file() | expand |
Context | Check | Description |
---|---|---|
yinshiyou/make_loongarch64 | success | Make finished |
yinshiyou/make_fate_loongarch64 | success | Make fate finished |
andriy/make_x86 | success | Make finished |
andriy/make_fate_x86 | success | Make fate finished |
diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index 7ba1f2a8cf..a377e776c7 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -3696,7 +3696,6 @@ static void free_input_thread(int i) av_packet_free(&pkt); pthread_join(f->thread, NULL); - f->joined = 1; av_thread_message_queue_free(&f->in_thread_queue); } diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h index 23b249780b..fc082bfbea 100644 --- a/fftools/ffmpeg.h +++ b/fftools/ffmpeg.h @@ -437,7 +437,6 @@ typedef struct InputFile { AVThreadMessageQueue *in_thread_queue; pthread_t thread; /* thread reading from this file */ int non_blocking; /* reading packets from the thread should not block */ - int joined; /* the thread has been joined */ int thread_queue_size; /* maximum number of queued packets */ } InputFile;