]> git.ipfire.org Git - thirdparty/tvheadend.git/commitdiff
mpegts input: rearrange locking in stopping_mux
authorJaroslav Kysela <perex@perex.cz>
Tue, 16 Jan 2018 11:05:24 +0000 (12:05 +0100)
committerJaroslav Kysela <perex@perex.cz>
Tue, 16 Jan 2018 11:05:24 +0000 (12:05 +0100)
src/input/mpegts/mpegts_input.c

index 8fdfb7a8350b29572022fd402b0f8982fd7f9795..bf2f410b5ebbe3664c0ac6bf5d2f6c0b91693b51 100644 (file)
@@ -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);
 }