compilation fixes.

diff --git a/modules/audio_filter/channel_mixer/headphone.c b/modules/audio_filter/channel_mixer/headphone.c
index a62e420a9de4083f6140087ec135e533fa5400c4..123e917acfe875f961b153bfbfa756ebd1bb8670 100644 (file)
--- a/modules/audio_filter/channel_mixer/headphone.c
+++ b/modules/audio_filter/channel_mixer/headphone.c
@@ -59,7 +59,7 @@ static void DoWork    ( aout_instance_t *, aout_filter_t *, aout_buffer_t *,
 
 vlc_module_begin();
     set_description( N_("headphone channel mixer with virtual spatialization effect") );
-    set_shorname( _("Headphone effect") );
+    set_shortname( _("Headphone effect") );
     set_category( CAT_AUDIO );
     set_subcategory( SUBCAT_AUDIO_AFILTER );
 

diff --git a/modules/video_filter/logo.c b/modules/video_filter/logo.c
index b29fead2451ae7ad12061cebda0d031eac856884..f6dfd289a016eea2c5c7594eed4e43daf40882df 100644 (file)
--- a/modules/video_filter/logo.c
+++ b/modules/video_filter/logo.c
@@ -35,6 +35,10 @@
 #include "filter_common.h"
 #include "vlc_image.h"
 
+#ifdef LoadImage
+#   undef LoadImage
+#endif
+
 /*****************************************************************************
  * Local prototypes
  *****************************************************************************/