Merge branch 1.0-bugfix into master

[vlc] / src / audio_output / output.c

diff --git a/src/audio_output/output.c b/src/audio_output/output.c
index 1181d1eb93ffdb17c23fd2d9955b5bc10ce99dee..8271868079a6d1cbaff60fb606384b35b512c9c0 100644 (file)
--- a/src/audio_output/output.c
+++ b/src/audio_output/output.c
@@ -54,7 +54,7 @@ int aout_OutputNew( aout_instance_t * p_aout,
     aout_lock_output_fifo( p_aout );
 
     /* Find the best output plug-in. */
-    p_aout->output.p_module = module_Need( p_aout, "audio output", "$aout", 0);
+    p_aout->output.p_module = module_need( p_aout, "audio output", "$aout", false );
     if ( p_aout->output.p_module == NULL )
     {
         msg_Err( p_aout, "no suitable audio output module" );
@@ -177,8 +177,7 @@ int aout_OutputNew( aout_instance_t * p_aout,
         /* Non-S/PDIF mixer only deals with float32 or fixed32. */
         p_aout->mixer.mixer.i_format
                      = (vlc_CPU() & CPU_CAPABILITY_FPU) ?
-                        VLC_FOURCC('f','l','3','2') :
-                        VLC_FOURCC('f','i','3','2');
+                        VLC_CODEC_FL32 : VLC_CODEC_FI32;
         aout_FormatPrepare( &p_aout->mixer.mixer );
     }
     else
@@ -196,7 +195,7 @@ int aout_OutputNew( aout_instance_t * p_aout,
                                      &p_aout->output.output ) < 0 )
     {
         msg_Err( p_aout, "couldn't create audio output pipeline" );
-        module_Unneed( p_aout, p_aout->output.p_module );
+        module_unneed( p_aout, p_aout->output.p_module );
         return -1;
     }
 
@@ -227,7 +226,7 @@ void aout_OutputDelete( aout_instance_t * p_aout )
         return;
     }
 
-    module_Unneed( p_aout, p_aout->output.p_module );
+    module_unneed( p_aout, p_aout->output.p_module );
 
     aout_FiltersDestroyPipeline( p_aout, p_aout->output.pp_filters,
                                  p_aout->output.i_nb_filters );