From: Derk-Jan Hartman <hartman@videolan.org>
Date: Tue, 26 May 2009 14:10:57 +0000 (+0200)
Subject: Merge commit 'origin/1.0-bugfix'
X-Git-Tag: 1.1.0-ff~5749
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=74e5a0727b83ea8bd5ee87dbce7596b990ef14c1;hp=c5c06b64c806052086e5772d64e540a8db7e4a9b;p=vlc

Merge commit 'origin/1.0-bugfix'
---

diff --git a/modules/gui/macosx/vout.m b/modules/gui/macosx/vout.m
index add95df3b6..94548d3e40 100644
--- 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 );
 }