[vlc-devel] commit: Cleaning. ( Rémi Duraffort )

[git version control]

vlc | branch: master | Rémi Duraffort <ivoire at videolan.org> | Tue Oct 14 20:43:48 2008 +0200| [17e8ab51bc2d7a2e12b0dd73064420d6af957851] | committer: Rémi Duraffort 

Cleaning.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=17e8ab51bc2d7a2e12b0dd73064420d6af957851
---

 modules/video_output/opengl.c      |    3 +++
 modules/video_output/opengllayer.m |    6 ------
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/modules/video_output/opengl.c b/modules/video_output/opengl.c
index 3711dde..ceae3bb 100644
--- a/modules/video_output/opengl.c
+++ b/modules/video_output/opengl.c
@@ -272,7 +272,10 @@ static int CreateVout( vlc_object_t *p_this )
     p_sys->p_vout =
         (vout_thread_t *)vlc_object_create( p_this, sizeof( vout_thread_t ) );
     if( p_sys->p_vout == NULL )
+    {
+        free( p_sys );
         return VLC_ENOMEM;
+    }
     vlc_object_attach( p_sys->p_vout, p_this );
 
     p_sys->p_vout->i_window_width = p_vout->i_window_width;
diff --git a/modules/video_output/opengllayer.m b/modules/video_output/opengllayer.m
index aed8602..e15c745 100644
--- a/modules/video_output/opengllayer.m
+++ b/modules/video_output/opengllayer.m
@@ -142,10 +142,7 @@ static int CreateVout( vlc_object_t *p_this )
     /* Allocate structure */
     p_vout->p_sys = p_sys = calloc( sizeof( vout_sys_t ), 1 );
     if( p_sys == NULL )
-    {
-        msg_Err( p_vout, "out of memory" );
         return VLC_EGENERIC;
-    }
 
     p_sys->i_tex_width  = p_vout->fmt_in.i_width;
     p_sys->i_tex_height = p_vout->fmt_in.i_height;
@@ -204,10 +201,7 @@ static int Init( vout_thread_t *p_vout )
         p_sys->pp_buffer[i] =
             malloc( p_sys->i_tex_width * p_sys->i_tex_height * i_pixel_pitch );
         if( !p_sys->pp_buffer[i] )
-        {
-            msg_Err( p_vout, "out of memory" );
             return VLC_EGENERIC;
-        }
     }
     p_sys->b_frame_available = false;
     p_sys->i_index = 0;