From 7211380a9e981cbf762bb7c337ce6a053fce2f88 Mon Sep 17 00:00:00 2001
From: Jaroslav Kysela <perex@perex.cz>
Date: Wed, 12 Nov 2014 09:52:55 +0100
Subject: [PATCH] mpegts input: fix possible NULL dereference (fix for the last
 patch)

---
 src/input/mpegts/mpegts_input.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/input/mpegts/mpegts_input.c b/src/input/mpegts/mpegts_input.c
index 4a49c67a..b5e46c67 100644
--- a/src/input/mpegts/mpegts_input.c
+++ b/src/input/mpegts/mpegts_input.c
@@ -724,10 +724,10 @@ mpegts_input_process
   int table_wakeup = 0;
   uint8_t *end = mpkt->mp_data + len;
   mpegts_mux_t          *mm  = mpkt->mp_mux;
-  mpegts_mux_instance_t *mmi = mm->mm_active;
+  mpegts_mux_instance_t *mmi;
   mpegts_pid_t *last_mp = NULL;
 
-  if (!mmi)
+  if (mm == NULL || (mmi = mm->mm_active) == NULL)
     return;
 
   mi->mi_live = 1;