Let the muxer deref packets all the time. If there is an error, the packet will be...

diff --git a/src/dvr/dvr_rec.c b/src/dvr/dvr_rec.c
index a46987fbde22d54ff58de78c2d7053716a517c1c..c030d0cf2c2cbac03a1448689d3a6c241717c9ef 100755 (executable)
--- a/src/dvr/dvr_rec.c
+++ b/src/dvr/dvr_rec.c
@@ -445,8 +445,8 @@ dvr_thread(void *aux)
       if(dispatch_clock > de->de_start - (60 * de->de_start_extra)) {
        dvr_rec_set_state(de, DVR_RS_RUNNING, 0);
 
-       if(!muxer_write_pkt(de->de_mux, sm->sm_data))
-         sm->sm_data = NULL;
+       muxer_write_pkt(de->de_mux, sm->sm_data);
+       sm->sm_data = NULL;
       }
       break;
 

diff --git a/src/dvr/mkmux.c b/src/dvr/mkmux.c
index 93fa24fc02acd0b11e860b8e94563ce6d5887aed..cf95e95eb04a1d4679132f54887cdc3546b9d3ab 100644 (file)
--- a/src/dvr/mkmux.c
+++ b/src/dvr/mkmux.c
@@ -899,8 +899,7 @@ mk_mux_write_pkt(mk_mux_t *mkm, struct th_pkt *pkt)
     mk_write_frame_i(mkm, t, pkt);
   }
   
-  if(!mkm->error)
-    pkt_ref_dec(pkt);
+  pkt_ref_dec(pkt);
 
   return mkm->error;
 }

diff --git a/src/muxer_pass.c b/src/muxer_pass.c
index e5866f920b761de8f313a03695daafa2f050473a..af73cc30a15d7dd2b9d7565365cf38c6a62f8ef7 100644 (file)
--- a/src/muxer_pass.c
+++ b/src/muxer_pass.c
@@ -231,8 +231,7 @@ pass_muxer_write_pkt(muxer_t *m, void *data)
     break;
   }
 
-  if(!pm->pm_error)
-    pktbuf_ref_dec(pb);
+  pktbuf_ref_dec(pb);
 
   return pm->pm_error;
 }

diff --git a/src/webui/webui.c b/src/webui/webui.c
index 1c3972b036b98dfa9fdfefd32f8e31a057b9fda0..14766b74d23ce4f0ecb0a2ceca2bfbc03b2896e6 100644 (file)
--- a/src/webui/webui.c
+++ b/src/webui/webui.c
@@ -199,9 +199,8 @@ http_stream_run(http_connection_t *hc, streaming_queue_t *sq,
     switch(sm->sm_type) {
     case SMT_MPEGTS:
     case SMT_PACKET:
-      if(!muxer_write_pkt(mux, sm->sm_data))
-       sm->sm_data = NULL;
-
+      muxer_write_pkt(mux, sm->sm_data);
+      sm->sm_data = NULL;
       break;
 
     case SMT_START: