Merge commit 'origin/1.0-bugfix'

diff --git a/modules/gui/macosx/vout.m b/modules/gui/macosx/vout.m
index add95df3b69e74bd9e9152b54cb7b8d1e2340792..94548d3e40488c013a3983217762d504a015a3fc 100644 (file)
--- a/modules/gui/macosx/vout.m
+++ b/modules/gui/macosx/vout.m
@@ -458,7 +458,6 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
     if( !VLCIntf || !VLCIntf->p_sys )
         return;
 
-    UInt8 UsrActivity;
     if( VLCIntf->p_sys->i_play_status == PLAYING_S )
         UpdateSystemActivity( UsrActivity );
 }