Fix return values for spu_Create() and spu_Init().

diff --git a/modules/stream_out/transcode.c b/modules/stream_out/transcode.c
index 987a2474b3f019d5d8431d647d68512fc46d3196..e6692e4c73d526c694ce6856129db6d5cf2baf1a 100644 (file)
--- a/modules/stream_out/transcode.c
+++ b/modules/stream_out/transcode.c
@@ -2857,8 +2857,7 @@ static int transcode_osd_new( sout_stream_t *p_stream, sout_stream_id_t *id )
     if( !p_sys->p_spu )
     {
         p_sys->p_spu = spu_Create( p_stream );
-        if( spu_Init( p_sys->p_spu ) != VLC_SUCCESS )
-            msg_Err( p_sys, "spu initialisation failed" );
+        spu_Init( p_sys->p_spu );
     }
 
     return VLC_SUCCESS;
@@ -2902,8 +2901,7 @@ static int transcode_osd_process( sout_stream_t *p_stream,
         if( !p_sys->p_spu )
         {
             p_sys->p_spu = spu_Create( p_stream );
-            if( spu_Init( p_sys->p_spu ) != VLC_SUCCESS )
-                msg_Err( p_stream, "spu initialisation failed" );
+            spu_Init( p_sys->p_spu );
         }
     }
 

diff --git a/src/video_output/vout_subpictures.c b/src/video_output/vout_subpictures.c
index aa5037d5508b567fc9ecfc9832c13e9df31b992f..9b6060458c8393da2f50121182a2115dd53a2300 100644 (file)
--- a/src/video_output/vout_subpictures.c
+++ b/src/video_output/vout_subpictures.c
@@ -114,7 +114,7 @@ int spu_Init( spu_t *p_spu )
 
     spu_ParseChain( p_spu );
 
-    return VLC_EGENERIC;
+    return VLC_SUCCESS;
 }
 
 int spu_ParseChain( spu_t *p_spu )
@@ -167,7 +167,7 @@ int spu_ParseChain( spu_t *p_spu )
     }
     if( val.psz_string ) free( val.psz_string );
 
-    return VLC_EGENERIC;
+    return VLC_SUCCESS;
 }
 
 /**