Remove excess whitespace

[vlc] / src / osd / osd_parser.c

diff --git a/src/osd/osd_parser.c b/src/osd/osd_parser.c
index b791d89e5cfabbbc9bebf73297528aa0d0eb6b83..f2d9ca80c7c77b66d45ffd9b3a250fb368abd753 100644 (file)
--- a/src/osd/osd_parser.c
+++ b/src/osd/osd_parser.c
@@ -28,13 +28,13 @@
 #include <string.h>
 
 #include <vlc/vlc.h>
+#include <vlc_vout.h>
 #include <vlc_config.h>
-#include <vlc_video.h>
 
 #include <vlc_keys.h>
 #include <vlc_image.h>
 #include <vlc_osd.h>
-#include <charset.h>
+#include <vlc_charset.h>
 
 
 #undef OSD_MENU_DEBUG
@@ -73,9 +73,6 @@ static picture_t *osd_LoadImage( vlc_object_t *p_this, const char *psz_filename
     {
         p_pic = image_ReadUrl( p_image, psz_filename, &fmt_in, &fmt_out );
         image_HandlerDelete( p_image );
-#if 0
-        p_pic = osd_YuvaYuvp( p_this, p_pic );
-#endif
     }
     else msg_Err( p_this, "unable to handle this chroma" );
 
@@ -91,8 +88,12 @@ static osd_menu_t *osd_MenuNew( osd_menu_t *p_menu, const char *psz_path, int i_
 
     p_menu->p_state = (osd_menu_state_t *) malloc( sizeof( osd_menu_state_t ) );
     if( !p_menu->p_state )
+    {
         msg_Err( p_menu, "Memory allocation for OSD Menu state failed" );
+        return NULL;
+    }
 
+    memset(p_menu->p_state, 0, sizeof(osd_menu_state_t));
     if( psz_path != NULL )
         p_menu->psz_path = strdup( psz_path );
     else