From: Jaroslav Kysela <perex@perex.cz>
Date: Tue, 16 Jan 2018 11:05:24 +0000 (+0100)
Subject: mpegts input: rearrange locking in stopping_mux
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0c50bed0b7f94299dbd5d11ed0766925c787524f;p=thirdparty%2Ftvheadend.git

mpegts input: rearrange locking in stopping_mux
---

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);
 }