mkv.cpp: better handling of quitting an ordered edition, add support for the LinkCN...

[vlc] / modules / stream_out / gather.c

diff --git a/modules/stream_out/gather.c b/modules/stream_out/gather.c
index 4be63ac5860449722c360b161b375ed6c2b3b676..debc9cd3928cf475cf5adaf433a45e61dd64b463 100644 (file)
--- a/modules/stream_out/gather.c
+++ b/modules/stream_out/gather.c
@@ -40,6 +40,8 @@ vlc_module_begin();
     set_description( _("Gathering stream output") );
     set_capability( "sout stream", 50 );
     add_shortcut( "gather" );
+    set_category( CAT_SOUT );
+    set_subcategory( SUBCAT_SOUT_STREAM );
     set_callbacks( Open, Close );
 vlc_module_end();
 
@@ -76,7 +78,7 @@ static int Open( vlc_object_t *p_this )
     sout_stream_sys_t *p_sys;
 
     p_stream->p_sys = p_sys = malloc( sizeof( sout_stream_sys_t ) );
-    p_sys->p_out    = sout_stream_new( p_stream->p_sout, p_stream->psz_next );
+    p_sys->p_out    = sout_StreamNew( p_stream->p_sout, p_stream->psz_next );
     if( p_sys->p_out == NULL )
     {
         free( p_sys );
@@ -108,7 +110,7 @@ static void Close( vlc_object_t * p_this )
     }
     free( p_sys->id );
 
-    sout_stream_delete( p_sys->p_out );
+    sout_StreamDelete( p_sys->p_out );
     free( p_sys );
 }