Compare commits

...

2 commits

Author SHA1 Message Date
Exeldro d953d0ef66
Merge f4c1be48b7 into 6cc0e2b803 2024-06-26 01:34:28 -03:00
Exeldro f4c1be48b7 obs-ffmpeg: Fix deadlock on shutting down muxer 2024-04-25 13:52:39 +02:00

View file

@ -745,11 +745,11 @@ static void *ffmpeg_mux_io_thread(void *data)
// Loop to write in chunk_size chunks
for (;;) {
pthread_mutex_lock(&ffm->io.data_mutex);
shutting_down = os_atomic_load_bool(
&ffm->io.shutdown_requested);
pthread_mutex_lock(&ffm->io.data_mutex);
// Fetch as many writes as possible from the deque
// and fill up our local chunk. This may involve seeking
// if ffmpeg needs to, so take care of that as well.