muxer: fix the meta write errors, fixes #2557

tvheadend · Dec 16, 2014 · b2a39e3 · Sorien · Dec 16, 2014 · perexg
1 parent cfa7cd0
commit b2a39e3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/input/mpegts/linuxdvb/linuxdvb_adapter.c b/src/input/mpegts/linuxdvb/linuxdvb_adapter.c
@@ -164,6 +164,7 @@ linuxdvb_adapter_create
 static dvb_fe_type_t
 linux_dvb_get_type(int linux_type)
 {
+  return DVB_TYPE_S;
   switch (linux_type) {
   case FE_QPSK:
     return DVB_TYPE_S;

diff --git a/src/muxer.h b/src/muxer.h
@@ -129,7 +129,7 @@ static inline int muxer_destroy (muxer_t *m)
   { if (m) { m->m_destroy(m); return 0; } return -1; }
 
 static inline int muxer_write_meta (muxer_t *m, struct epg_broadcast *eb, const char *comment)
-  { if (m && eb) return m->m_write_meta(m, eb, comment); return -1; }
+  { if (m) return m->m_write_meta(m, eb, comment); return -1; }
 
 static inline int muxer_write_pkt (muxer_t *m, streaming_message_type_t smt, void *data)
   { if (m && data) return m->m_write_pkt(m, smt, data); return -1; }