Honor --ffmpeg-skip-frame setting when used with --ffmpeg-hurry-up.

[vlc] / modules / control / motion.c

diff --git a/modules/control/motion.c b/modules/control/motion.c
index 783af9fe1cc0bdb0387d0d1fd63a7b2a85591a99..ad43d281345f0af6fe9c341e085b46beb6ff9612 100644 (file)
--- a/modules/control/motion.c
+++ b/modules/control/motion.c
@@ -25,8 +25,6 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <stdlib.h>                                      /* malloc(), free() */
-#include <string.h>
 #include <math.h>
 
 #include <vlc/vlc.h>
@@ -47,8 +45,9 @@
 struct intf_sys_t
 {
     enum { NO_SENSOR, HDAPS_SENSOR, AMS_SENSOR, UNIMOTION_SENSOR } sensor;
+#ifdef __APPLE__
     enum sms_hardware unimotion_hw;
-
+#endif
     int i_calibrate;
 
     vlc_bool_t b_use_rotate;
@@ -238,8 +237,10 @@ static void RunIntf( intf_thread_t *p_intf )
 static int GetOrientation( intf_thread_t *p_intf )
 {
     FILE *f;
-    int i_x, i_y, i_z;
-
+    int i_x, i_y;
+#ifdef __APPLE__
+    int i_z;
+#endif
     switch( p_intf->p_sys->sensor )
     {
     case HDAPS_SENSOR:
@@ -279,9 +280,9 @@ static int GetOrientation( intf_thread_t *p_intf )
             else
                 return 3600 + asin(d_x)*3600/3.141;
         }
-#endif
         else
             return 0;
+#endif
     default:
         return 0;
     }