From 0c50bed0b7f94299dbd5d11ed0766925c787524f Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Tue, 16 Jan 2018 12:05:24 +0100 Subject: [PATCH] mpegts input: rearrange locking in stopping_mux --- src/input/mpegts/mpegts_input.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/input/mpegts/mpegts_input.c b/src/input/mpegts/mpegts_input.c index 8fdfb7a83..bf2f410b5 100644 --- a/src/input/mpegts/mpegts_input.c +++ b/src/input/mpegts/mpegts_input.c @@ -957,11 +957,10 @@ mpegts_input_stopping_mux { assert(mmi->mmi_mux->mm_active); + pthread_mutex_lock(&mi->mi_output_lock); pthread_mutex_lock(&mi->mi_input_lock); mmi->mmi_mux->mm_active = NULL; pthread_mutex_unlock(&mi->mi_input_lock); - pthread_mutex_lock(&mi->mi_output_lock); - mmi->mmi_mux->mm_active = NULL; pthread_mutex_unlock(&mi->mi_output_lock); } -- 2.47.3