OBS/obs-studio
OBS/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2024-07-02 09:33:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

obs-ffmpeg: Fix deadlock on shutting down muxer

Browse source
This commit is contained in:
Exeldro 2024-04-25 13:52:39 +02:00
parent df1ec719d1
commit f4c1be48b7
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
plugins/obs-ffmpeg/ffmpeg-mux/ffmpeg-mux.c
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.