Merge branch 'master' of git://git.videolan.org/vlc

[vlc] / src / osd / osd.c

diff --git a/src/osd/osd.c b/src/osd/osd.c
index 7c5046de1158d82811e8b878a55e7aa72c29960c..086abf8c87e3acdbc7c523189aea5e440b64ea62 100644 (file)
--- a/src/osd/osd.c
+++ b/src/osd/osd.c
@@ -33,6 +33,7 @@
 #include <vlc_keys.h>
 #include <vlc_osd.h>
 #include <vlc_image.h>
+#include <vlc_modules.h>
 
 #include "libvlc.h"
 
@@ -399,7 +400,7 @@ void osd_MenuActivate( vlc_object_t *p_this )
                            var_InheritInteger( p_osd, p_button->psz_action ) );
 #if defined(OSD_MENU_DEBUG)
         msg_Dbg( p_osd, "select (%d, %s)",
-                 var_InheritInteger( p_osd, p_button->psz_action ),
+                 (int)var_InheritInteger( p_osd, p_button->psz_action ),
                  p_button->psz_action );
 #endif
     }