From: Jaroslav Kysela <perex@perex.cz>
Date: Sat, 31 Jan 2015 16:39:16 +0000 (+0100)
Subject: muxers: ignore the NULL payload
X-Git-Tag: v4.1~400
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ce2fc637b60fae5ab7ea2e4b7cea7f9a94d11dd1;p=thirdparty%2Ftvheadend.git

muxers: ignore the NULL payload
---

diff --git a/src/muxer/muxer_libav.c b/src/muxer/muxer_libav.c
index 9160af687..32f9cba1d 100644
--- a/src/muxer/muxer_libav.c
+++ b/src/muxer/muxer_libav.c
@@ -403,6 +403,8 @@ lav_muxer_write_pkt(muxer_t *m, streaming_message_type_t smt, void *data)
 
     if(st->id != pkt->pkt_componentindex)
       continue;
+    if(pkt->pkt_payload == NULL)
+      continue;
 
     av_init_packet(&packet);
 
diff --git a/src/muxer/tvh/mkmux.c b/src/muxer/tvh/mkmux.c
index 6bc62a088..aaad9b048 100644
--- a/src/muxer/tvh/mkmux.c
+++ b/src/muxer/tvh/mkmux.c
@@ -1188,7 +1188,7 @@ mk_mux_write_pkt(mk_mux_t *mkm, th_pkt_t *pkt)
       break;
   }
   
-  if(i >= mkm->ntracks) {
+  if(i >= mkm->ntracks || pkt->pkt_payload == NULL) {
     pkt_ref_dec(pkt);
     return mkm->error;
   }