* all: remove sout_format_t and use es_format_t instead.

[vlc] / src / input / input_dec.c

diff --git a/src/input/input_dec.c b/src/input/input_dec.c
index 2c8bdeac7136a93a335b7c390e6ba784be229f01..19e5ffd28f92ad37c9a46426aa9fbf11b0fe9392 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-2001 VideoLAN
- * $Id: input_dec.c,v 1.71 2003/11/18 22:48:46 fenrir Exp $
+ * $Id: input_dec.c,v 1.72 2003/11/21 15:32:08 fenrir Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *          Gildas Bazin <gbazin@netcourrier.com>
@@ -303,11 +303,11 @@ struct decoder_owner_sys_t
     vout_thread_t   *p_vout;
 
     sout_packetizer_input_t *p_sout;
-    sout_format_t           sout_format;
 
     /* Current format in use by the output */
     video_format_t video;
-    audio_format_t audio; 
+    audio_format_t audio;
+    es_format_t    sout;
 };
 
 /*****************************************************************************
@@ -487,26 +487,10 @@ static int DecoderThread( decoder_t * p_dec )
             {
                 if( !p_dec->p_owner->p_sout )
                 {
-                    sout_format_t *p_format = &p_dec->p_owner->sout_format;
-
-                    p_format->i_cat = p_dec->fmt_out.i_cat;
-                    p_format->i_fourcc = p_dec->fmt_out.i_codec;
-                    p_format->i_sample_rate =
-                        p_dec->fmt_out.audio.i_rate;
-                    p_format->i_channels =
-                        p_dec->fmt_out.audio.i_channels;
-                    p_format->i_block_align =
-                        p_dec->fmt_out.audio.i_blockalign;
-                    p_format->i_width  =
-                        p_dec->fmt_out.video.i_width;
-                    p_format->i_height =
-                        p_dec->fmt_out.video.i_height;
-                    p_format->i_bitrate     = p_dec->fmt_out.i_bitrate;
-                    p_format->i_extra_data  = p_dec->fmt_out.i_extra;
-                    p_format->p_extra_data  = p_dec->fmt_out.p_extra;
+                    es_format_Copy( &p_dec->p_owner->sout, &p_dec->fmt_out );
 
                     p_dec->p_owner->p_sout =
-                        sout_InputNew( p_dec, p_format );
+                        sout_InputNew( p_dec, &p_dec->p_owner->sout );
 
                     if( p_dec->p_owner->p_sout == NULL )
                     {