Remove useless test before a free().

[vlc] / modules / video_output / opengl.c

diff --git a/modules/video_output/opengl.c b/modules/video_output/opengl.c
index 4ab6a0f4bd5e7dc0b092887749e9b691c62bf4ca..a3b1ba9a7d36e5f3bc2554ac538ebbe5725df237 100644 (file)
--- a/modules/video_output/opengl.c
+++ b/modules/video_output/opengl.c
@@ -29,6 +29,10 @@
  *****************************************************************************/
 #include <errno.h>                                                 /* ENOMEM */
 
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include <vlc/vlc.h>
 #include <vlc_vout.h>
 
@@ -141,7 +145,7 @@ static int SendEvents    ( vlc_object_t *, char const *,
 
 #ifdef OPENGL_MORE_EFFECT
 static float Z_Compute   ( float, int, float, float );
-static void Transform    ( float, int, float, float, int, int, int, int, double *, double * );
+static void Transform    ( int, float, float, int, int, int, int, double *, double * );
 
 /*****************************************************************************
  * Module descriptor
@@ -298,7 +302,7 @@ static int CreateVout( vlc_object_t *p_this )
     {
         msg_Warn( p_vout, "No OpenGL provider found" );
         vlc_object_detach( p_sys->p_vout );
-        vlc_object_destroy( p_sys->p_vout );
+        vlc_object_release( p_sys->p_vout );
         return VLC_ENOOBJ;
     }
 
@@ -491,7 +495,7 @@ static int Init( vout_thread_t *p_vout )
         p_sys->i_effect = OPENGL_EFFECT_NONE;
 #endif
     }
-    if( val.psz_string ) free( val.psz_string );
+    free( val.psz_string );
 
     if( p_sys->i_effect & ( OPENGL_EFFECT_CUBE |
                 OPENGL_EFFECT_TRANSPARENT_CUBE ) )
@@ -549,8 +553,8 @@ static void End( vout_thread_t *p_vout )
 
     /* Free the texture buffer*/
     glDeleteTextures( 2, p_sys->p_textures );
-    if( p_sys->pp_buffer[0] ) free( p_sys->pp_buffer[0] );
-    if( p_sys->pp_buffer[1] ) free( p_sys->pp_buffer[1] );
+    free( p_sys->pp_buffer[0] );
+    free( p_sys->pp_buffer[1] );
 
     if( p_sys->p_vout->pf_unlock )
     {
@@ -570,7 +574,7 @@ static void DestroyVout( vlc_object_t *p_this )
 
     module_Unneed( p_sys->p_vout, p_sys->p_vout->p_module );
     vlc_object_detach( p_sys->p_vout );
-    vlc_object_destroy( p_sys->p_vout );
+    vlc_object_release( p_sys->p_vout );
 
     free( p_sys );
 }
@@ -695,6 +699,7 @@ static int Manage( vout_thread_t *p_vout )
  *****************************************************************************/
 static void Render( vout_thread_t *p_vout, picture_t *p_pic )
 {
+    VLC_UNUSED(p_pic);
     vout_sys_t *p_sys = p_vout->p_sys;
 
     /* On Win32/GLX, we do this the usual way:
@@ -759,7 +764,7 @@ static void Render( vout_thread_t *p_vout, picture_t *p_pic )
 /*****************************************************************************
  *   Transform: Calculate the distorted grid coordinates
  *****************************************************************************/
-static void Transform(float p, int distortion, float width, float height,int i, int j, int i_visible_width, int i_visible_height, double *ix,double *iy)
+static void Transform( int distortion, float width, float height,int i, int j, int i_visible_width, int i_visible_height, double *ix, double *iy )
 {
     double x,y,xnew,ynew;
     double r,theta,rnew,thetanew;
@@ -868,6 +873,7 @@ static float Z_Compute(float p, int distortion, float x, float y)
  *****************************************************************************/
 static void DisplayVideo( vout_thread_t *p_vout, picture_t *p_pic )
 {
+    VLC_UNUSED(p_pic);
     vout_sys_t *p_sys = p_vout->p_sys;
     float f_width, f_height, f_x, f_y;
 
@@ -950,7 +956,7 @@ static void DisplayVideo( vout_thread_t *p_vout, picture_t *p_pic )
                 int i_k = ((i_m % 4) == 1) || ((i_m % 4) == 2);
                 int i_l = ((i_m % 4) == 2) || ((i_m % 4) == 3);
 
-                Transform(f_p, i_distortion, f_width, f_height, i_i + i_k * i_n_x, i_j + i_l * i_n_y, p_vout->fmt_out.i_visible_width, p_vout->fmt_out.i_visible_height, &d_x, &d_y);
+                Transform( i_distortion, f_width, f_height, i_i + i_k * i_n_x, i_j + i_l * i_n_y, p_vout->fmt_out.i_visible_width, p_vout->fmt_out.i_visible_height, &d_x, &d_y);
                 glTexCoord2f(f_x + d_x, f_y + d_y);
                 d_x =  - 1.0 + 2.0 * ((double)(i_k * i_n_x + i_i) / (double)p_vout->fmt_out.i_visible_width);
                 d_y =    1.0 - 2.0 * (((double)i_l * i_n_y + i_j) / (double)p_vout->fmt_out.i_visible_height);
@@ -1102,5 +1108,6 @@ static int InitTextures( vout_thread_t *p_vout )
 static int SendEvents( vlc_object_t *p_this, char const *psz_var,
                        vlc_value_t oldval, vlc_value_t newval, void *_p_vout )
 {
+    VLC_UNUSED(p_this); VLC_UNUSED(oldval);
     return var_Set( (vlc_object_t *)_p_vout, psz_var, newval );
 }