macosx: Make sure the manageIntf: Timer is getting cancelled at exit.

[vlc] / modules / video_filter / rotate.c

diff --git a/modules/video_filter/rotate.c b/modules/video_filter/rotate.c
index 2b5c6ccd829217c1be812da69b68fed928ca87a3..e185a33ce4b5909ff641f8370cc998184fa90801 100644 (file)
--- a/modules/video_filter/rotate.c
+++ b/modules/video_filter/rotate.c
@@ -25,12 +25,12 @@
  * Preamble
  *****************************************************************************/
 
-#include <math.h>                                            /* sin(), cos() */
-
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
 
+#include <math.h>                                            /* sin(), cos() */
+
 #include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_vout.h>
@@ -131,10 +131,7 @@ static int Create( vlc_object_t *p_this )
     /* Allocate structure */
     p_filter->p_sys = malloc( sizeof( filter_sys_t ) );
     if( p_filter->p_sys == NULL )
-    {
-        msg_Err( p_filter, "out of memory" );
         return VLC_ENOMEM;
-    }
     p_sys = p_filter->p_sys;
 
     config_ChainParse( p_filter, FILTER_PREFIX, ppsz_filter_options,
@@ -283,7 +280,7 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic )
         }
     }
 
-    return CopyMetaAndRelease( p_outpic, p_pic );
+    return CopyInfoAndRelease( p_outpic, p_pic );
 }
 
 /*****************************************************************************
@@ -358,7 +355,6 @@ static picture_t *FilterPacked( filter_t *p_filter, picture_t *p_pic )
             else
             {
                 p_out[i_line*i_pitch+2*i_col] = 0x00;
-                i_col_orig /= 2;
                 p_out_u[i_line*i_pitch+2*i_col] = 0x80;
                 p_out_v[i_line*i_pitch+2*i_col] = 0x80;
             }
@@ -386,7 +382,7 @@ static picture_t *FilterPacked( filter_t *p_filter, picture_t *p_pic )
         }
     }
 
-    return CopyMetaAndRelease( p_outpic, p_pic );
+    return CopyInfoAndRelease( p_outpic, p_pic );
 }
 
 /*****************************************************************************