Commit 09ba73c7 authored by Laurent Aimar's avatar Laurent Aimar

* input, stream_output: handle sout_instance_t->p_meta.

parent 0afa4317
......@@ -899,7 +899,14 @@ static int InitThread( input_thread_t * p_input )
}
if( p_playlist ) vlc_object_release( p_playlist );
vlc_meta_Delete( meta );
if( p_input->stream.p_sout && p_input->stream.p_sout->p_meta == NULL )
{
p_input->stream.p_sout->p_meta = meta;
}
else
{
vlc_meta_Delete( meta );
}
}
/* get length */
......
......@@ -31,8 +31,10 @@
#include <string.h> /* strerror() */
#include <vlc/vlc.h>
#include <vlc/sout.h>
#include "vlc_meta.h"
#undef DEBUG_BUFFER
/*****************************************************************************
* Local prototypes
......@@ -117,6 +119,7 @@ sout_instance_t * __sout_NewInstance ( vlc_object_t *p_parent,
/* *** init descriptor *** */
p_sout->psz_sout = strdup( psz_dest );
p_sout->p_meta = NULL;
p_sout->i_preheader = 0;
p_sout->i_padding = 0;
p_sout->i_out_pace_nocontrol = 0;
......@@ -162,6 +165,11 @@ void sout_DeleteInstance( sout_instance_t * p_sout )
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 );
vlc_mutex_destroy( &p_sout->lock );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment