Changeset a5f3b25025d31eebdc86ebb7bce772e29f249130

Timestamp:

20/04/08 21:26:49 (6 months ago)

Author:

Rafaël Carré <funman@videolan.org>

git-committer:

Rafaël Carré <funman@videolan.org> 1208719609 +0200

git-parent:

[42a0d047849f391a75432dfdf5d71523d6ec08c7]

git-author:

Rafaël Carré <funman@videolan.org> 1208719609 +0200

Message:

Correctly release sout object when it has been kept

Files:

• src/libvlc-common.c (modified) (2 diffs)

src/libvlc-common.c

@@ -944 +944 @@
-    aout_instance_t    * p_aout = NULL;
-    announce_handler_t * p_announce = NULL;
+    sout_instance_t    * p_sout = NULL;
-
-    /* Ask the interfaces to stop and destroy them */
@@ -976 +977 @@
-        vlc_object_release( (vlc_object_t *)p_aout );
-        aout_Delete( p_aout );
+    }
+
+    p_sout = vlc_object_find( p_libvlc, VLC_OBJECT_SOUT, FIND_CHILD );
+    if( p_sout )
+    {
+        msg_Dbg( p_sout, "removing kept stream output" );
+        vlc_object_detach( (vlc_object_t*)p_sout );
+        vlc_object_release( (vlc_object_t*)p_sout );
+        sout_DeleteInstance( p_sout );
-    }
-