Changeset 09ba73c7643dd96696aeaa82bc116b2b5d5b5573

Timestamp:

10/03/04 22:55:25 (5 years ago)

Author:

Laurent Aimar <fenrir@videolan.org>

git-committer:

Laurent Aimar <fenrir@videolan.org> 1078955725 +0000

git-parent:

[0afa4317178d8585ea7ee74bfc8c17b0dd7fddbb]

git-author:

Laurent Aimar <fenrir@videolan.org> 1078955725 +0000

Message:

• input, stream_output: handle sout_instance_t->p_meta.
  

Files:

• src/input/input.c (modified) (1 diff)
• src/stream_output/stream_output.c (modified) (3 diffs)

src/input/input.c

@@ -900 +900 @@
-        if( p_playlist ) vlc_object_release( p_playlist );
-
-
+
+
+
+
+
+
+
+
-    }
-

src/stream_output/stream_output.c

@@ -32 +32 @@
-
-#include <vlc/vlc.h>
-
-#include <vlc/sout.h>
+
+#include "vlc_meta.h"
+
-#undef DEBUG_BUFFER
-/*****************************************************************************
@@ -118 +120 @@
-    /* *** init descriptor *** */
-    p_sout->psz_sout    = strdup( psz_dest );
+    p_sout->p_meta      = NULL;
-    p_sout->i_preheader = 0;
-    p_sout->i_padding   = 0;
@@ -162 +165 @@
-    FREE( p_sout->psz_sout );
-    FREE( p_sout->psz_chain );
+
+    if( p_sout->p_meta )
+    {
+        vlc_meta_Delete( p_sout->p_meta );
+    }
-
-    sout_stream_delete( p_sout->p_stream );