[vlc-devel] commit: Properly attach stream_Demux object to its parent. ( Marian Ďurkovič )

git version control git at videolan.org
Mon Sep 7 21:29:30 CEST 2009


vlc | branch: master | Marian Ďurkovič <md at bts.sk> | Mon Sep  7 07:47:34 2009 +0200| [369e8d4f46a372514b899e9cd3182ad013fff9a0] | committer: Rémi Denis-Courmont 

Properly attach stream_Demux object to its parent.

Now :demuxdump-file=foo works correctly with RTP input.

Signed-off-by: Rémi Denis-Courmont <remi at remlab.net>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=369e8d4f46a372514b899e9cd3182ad013fff9a0
---

 src/input/stream_demux.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/src/input/stream_demux.c b/src/input/stream_demux.c
index 777091c..f402051 100644
--- a/src/input/stream_demux.c
+++ b/src/input/stream_demux.c
@@ -93,9 +93,12 @@ stream_t *stream_DemuxNew( demux_t *p_demux, const char *psz_demux, es_out_t *ou
         return NULL;
     }
 
+    vlc_object_attach( s, p_obj );
+
     if( vlc_thread_create( s, "stream out", DStreamThread,
                            VLC_THREAD_PRIORITY_INPUT ) )
     {
+        vlc_object_detach( s );
         stream_CommonDelete( s );
         free( p_sys->psz_name );
         free( p_sys );
@@ -132,7 +135,7 @@ static void DStreamDelete( stream_t *s )
     block_FifoRelease( p_sys->p_fifo );
     free( p_sys->psz_name );
     free( p_sys );
-
+    vlc_object_detach( s );
     stream_CommonDelete( s );
 }
 




More information about the vlc-devel mailing list