X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Faudio_output%2Fmixer.c;h=0e73a2109cffcc7fa952073e01fc76e6999e88b5;hb=6903d514d3ea8113f91b1bedde862607f7efc92a;hp=7f1c2ad2eb1e1e411120fa863fe47ff76b94c24e;hpb=f0c83daa831d070058e04142791eb9d9d0423e0b;p=vlc

diff --git a/src/audio_output/mixer.c b/src/audio_output/mixer.c
index 7f1c2ad2eb..0e73a2109c 100644
--- a/src/audio_output/mixer.c
+++ b/src/audio_output/mixer.c
@@ -29,7 +29,7 @@
 #endif
 
 #include <stddef.h>
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 
 #ifdef HAVE_ALLOCA_H
 #   include <alloca.h>
@@ -314,7 +314,6 @@ static int MixBuffer( aout_instance_t * p_aout )
                       p_output_buffer );
     if ( p_output_buffer == NULL )
     {
-        msg_Err( p_aout, "out of memory" );
         vlc_mutex_unlock( &p_aout->input_fifos_lock );
         return -1;
     }