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

git version control git at videolan.org
Tue Sep 8 12:19:29 CEST 2009


vlc | branch: 1.0-bugfix | Marian Ďurkovič <md at bts.sk> | Mon Sep  7 07:47:34 2009 +0200| [df4c17d6b9ab3c5756aa264f6feffb964330e85d] | committer: Marian Ďurkovič 

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=df4c17d6b9ab3c5756aa264f6feffb964330e85d
---

 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 7435982..7200ac1 100644
--- a/src/input/stream_demux.c
+++ b/src/input/stream_demux.c
@@ -92,9 +92,12 @@ stream_t *__stream_DemuxNew( vlc_object_t *p_obj, const char *psz_demux,
         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 );
@@ -131,7 +134,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