[vlc-devel] commit: Cleanup no functionality changes. (Jean-Paul Saman )

[git version control]

vlc | branch: 0.8.6-bugfix | Jean-Paul Saman <jpsaman at videolan.org> | Mon Nov  3 21:46:36 2008 +0100| [31d4355efa51a6dd3bfbc897d7e7e9e6828ef287] | committer: Jean-Paul Saman 

Cleanup no functionality changes.

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

 modules/video_output/opengl.c   |    4 +---
 src/video_output/video_output.c |   23 ++++++++++-------------
 2 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/modules/video_output/opengl.c b/modules/video_output/opengl.c
index 1f10d8e..a7f33cc 100644
--- a/modules/video_output/opengl.c
+++ b/modules/video_output/opengl.c
@@ -268,8 +268,7 @@ static int CreateVout( vlc_object_t *p_this )
     p_vout->p_sys = p_sys = malloc( sizeof( vout_sys_t ) );
     if( p_sys == NULL )
     {
-        msg_Err( p_vout, "out of memory" );
-        return VLC_EGENERIC;
+        return VLC_ENOMEM;
     }
 
     var_Create( p_vout, "opengl-effect", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
@@ -292,7 +291,6 @@ static int CreateVout( vlc_object_t *p_this )
         (vout_thread_t *)vlc_object_create( p_this, VLC_OBJECT_OPENGL );
     if( p_sys->p_vout == NULL )
     {
-        msg_Err( p_vout, "out of memory" );
         return VLC_ENOMEM;
     }
     vlc_object_attach( p_sys->p_vout, p_this );
diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c
index 2fdac88..e6eb66d 100644
--- a/src/video_output/video_output.c
+++ b/src/video_output/video_output.c
@@ -225,7 +225,6 @@ vout_thread_t * __vout_Create( vlc_object_t *p_parent, video_format_t *p_fmt )
     p_vout = vlc_object_create( p_parent, VLC_OBJECT_VOUT );
     if( p_vout == NULL )
     {
-        msg_Err( p_parent, "out of memory" );
         return NULL;
     }
 
@@ -242,7 +241,7 @@ vout_thread_t * __vout_Create( vlc_object_t *p_parent, video_format_t *p_fmt )
         p_vout->p_picture[i_index].pf_unlock = NULL;
         p_vout->p_picture[i_index].i_status = FREE_PICTURE;
         p_vout->p_picture[i_index].i_type   = EMPTY_PICTURE;
-        p_vout->p_picture[i_index].b_slow   = 0;
+        p_vout->p_picture[i_index].b_slow   = VLC_FALSE;
     }
 
     /* No images in the heap */
@@ -266,7 +265,7 @@ vout_thread_t * __vout_Create( vlc_object_t *p_parent, video_format_t *p_fmt )
     p_vout->render.i_bmask    = 0;
 
     p_vout->render.i_last_used_pic = -1;
-    p_vout->render.b_allow_modify_pics = 1;
+    p_vout->render.b_allow_modify_pics = VLC_TRUE;
 
     /* Zero the output heap */
     I_OUTPUTPICTURES = 0;
@@ -282,17 +281,17 @@ vout_thread_t * __vout_Create( vlc_object_t *p_parent, video_format_t *p_fmt )
     /* Initialize misc stuff */
     p_vout->i_changes    = 0;
     p_vout->f_gamma      = 0;
-    p_vout->b_grayscale  = 0;
-    p_vout->b_info       = 0;
-    p_vout->b_interface  = 0;
-    p_vout->b_scale      = 1;
-    p_vout->b_fullscreen = 0;
+    p_vout->b_grayscale  = VLC_FALSE;
+    p_vout->b_info       = VLC_FALSE;
+    p_vout->b_interface  = VLC_FALSE;
+    p_vout->b_scale      = VLC_TRUE;
+    p_vout->b_fullscreen = VLC_FALSE;
     p_vout->i_alignment  = 0;
     p_vout->render_time  = 10;
     p_vout->c_fps_samples = 0;
-    p_vout->b_filter_change = 0;
-    p_vout->pf_control = 0;
-    p_vout->p_parent_intf = 0;
+    p_vout->b_filter_change = VLC_FALSE;
+    p_vout->pf_control = NULL;
+    p_vout->p_parent_intf = NULL;
     p_vout->i_par_num = p_vout->i_par_den = 1;
 
     /* Initialize locks */
@@ -398,7 +397,6 @@ vout_thread_t * __vout_Create( vlc_object_t *p_parent, video_format_t *p_fmt )
     }
     var_AddCallback( p_vout, "deinterlace", DeinterlaceCallback, NULL );
 
-
     var_Create( p_vout, "vout-filter", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
     text.psz_string = _("Filters");
     var_Change( p_vout, "vout-filter", VLC_VAR_SETTEXT, &text, NULL );
@@ -420,7 +418,6 @@ vout_thread_t * __vout_Create( vlc_object_t *p_parent, video_format_t *p_fmt )
     if( vlc_thread_create( p_vout, "video output", RunThread,
                            VLC_THREAD_PRIORITY_OUTPUT, VLC_TRUE ) )
     {
-        msg_Err( p_vout, "out of memory" );
         module_Unneed( p_vout, p_vout->p_module );
         vlc_object_detach( p_vout );
         vlc_object_destroy( p_vout );