String fixes in src (Refs:#438)

[vlc] / src / audio_output / output.c

diff --git a/src/audio_output/output.c b/src/audio_output/output.c
index a3d07aca9e48b01c35037135625ae56597ee5707..f97d7b8554c3d2e347e3f4ad475ee6c69699e794 100644 (file)
--- a/src/audio_output/output.c
+++ b/src/audio_output/output.c
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * output.c : internal management of output streams for the audio output
  *****************************************************************************
- * Copyright (C) 2002-2004 VideoLAN (Centrale Réseaux) and its contributors
+ * Copyright (C) 2002-2004 the VideoLAN team
  * $Id$
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
@@ -18,7 +18,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 /*****************************************************************************
@@ -57,7 +57,7 @@ int aout_OutputNew( aout_instance_t * p_aout,
     p_aout->output.p_module = module_Need( p_aout, "audio output", "$aout", 0);
     if ( p_aout->output.p_module == NULL )
     {
-        msg_Err( p_aout, "no suitable aout module" );
+        msg_Err( p_aout, "no suitable audio output module" );
         vlc_mutex_unlock( &p_aout->output_fifo_lock );
         return -1;
     }
@@ -186,15 +186,16 @@ int aout_OutputNew( aout_instance_t * p_aout,
         p_aout->mixer.mixer.i_format = p_format->i_format;
     }
 
-    aout_FormatPrint( p_aout, "mixer", &p_aout->output.output );
+    aout_FormatPrint( p_aout, "mixer", &p_aout->mixer.mixer );
 
     /* Create filters. */
+    p_aout->output.i_nb_filters = 0;
     if ( aout_FiltersCreatePipeline( p_aout, p_aout->output.pp_filters,
                                      &p_aout->output.i_nb_filters,
                                      &p_aout->mixer.mixer,
                                      &p_aout->output.output ) < 0 )
     {
-        msg_Err( p_aout, "couldn't set an output pipeline" );
+        msg_Err( p_aout, "couldn't create audio output pipeline" );
         module_Unneed( p_aout, p_aout->output.p_module );
         return -1;
     }