* all: sout have now access to psz_language.

diff --git a/src/input/es_out.c b/src/input/es_out.c
index de645269a8546e523f106ad060efa6fbc0a1d515..078d9733bae7e173ad713cbda8d67325072c53a9 100644 (file)
--- a/src/input/es_out.c
+++ b/src/input/es_out.c
@@ -2,7 +2,7 @@
  * es_out.c: Es Out handler for input.
  *****************************************************************************
  * Copyright (C) 2003-2004 VideoLAN
- * $Id: es_out.c,v 1.22 2004/01/30 14:25:39 fenrir Exp $
+ * $Id: es_out.c,v 1.23 2004/01/30 17:49:21 fenrir Exp $
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
  *
@@ -525,17 +525,16 @@ static es_out_id_t *EsOutAdd( es_out_t *out, es_format_t *fmt )
         if( p_playlist ) vlc_object_release( p_playlist );
     }
 
+    es_format_Copy( &es->p_es->fmt, fmt );
+
     /* Apply mode
      * XXX change that when we do group too */
     if( 1 )
     {
         EsOutSelect( out, es, VLC_FALSE );
     }
-
     vlc_mutex_unlock( &p_input->stream.stream_lock );
 
-    es->p_es->fmt = *fmt;
-
     TAB_APPEND( out->p_sys->i_es, out->p_sys->es, es );
     p_sys->i_id++;  /* always incremented */
     switch( fmt->i_cat )

diff --git a/src/input/input_dec.c b/src/input/input_dec.c
index f83006634a7c03150daaed5e227fbf735c84e7b6..c42053d9a3843acc7c0757812af18b873ca973d2 100644 (file)
--- a/src/input/input_dec.c
+++ b/src/input/input_dec.c
@@ -2,7 +2,7 @@
  * input_dec.c: Functions for the management of decoders
  *****************************************************************************
  * Copyright (C) 1999-2004 VideoLAN
- * $Id: input_dec.c,v 1.88 2004/01/25 17:16:05 zorglub Exp $
+ * $Id: input_dec.c,v 1.89 2004/01/30 17:49:21 fenrir Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *          Gildas Bazin <gbazin@netcourrier.com>
@@ -582,6 +582,10 @@ static int DecoderDecode( decoder_t *p_dec, block_t *p_block )
                         p_dec->p_owner->p_es_descriptor->p_pgrm->i_number;
                 }
                 p_dec->p_owner->sout.i_id = p_dec->p_owner->p_es_descriptor->i_id - 1;
+                if( p_dec->fmt_in.psz_language )
+                {
+                    p_dec->p_owner->sout.psz_language = strdup( p_dec->fmt_in.psz_language );
+                }
 
                 p_dec->p_owner->p_sout =
                     sout_InputNew( p_dec, &p_dec->p_owner->sout );