[vlc-commits] transcode: don't fail spu track if we don't have something to render

Ilkka Ollakka git at videolan.org
Wed Feb 26 13:04:13 CET 2014


vlc | branch: master | Ilkka Ollakka <ileoo at videolan.org> | Wed Feb 26 13:52:58 2014 +0200| [34635d833e2b2378eac387f33c5d6bd18a487c07] | committer: Ilkka Ollakka

transcode: don't fail spu track if we don't have something to render

SPU track works even if it doesn't have something to render at given time.
Fixes soverlay and subtitles in sout.

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

 modules/stream_out/transcode/spu.c |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/modules/stream_out/transcode/spu.c b/modules/stream_out/transcode/spu.c
index 5738f07..ccdeca1 100644
--- a/modules/stream_out/transcode/spu.c
+++ b/modules/stream_out/transcode/spu.c
@@ -129,7 +129,10 @@ int transcode_spu_process( sout_stream_t *p_stream,
 
     p_subpic = id->p_decoder->pf_decode_sub( id->p_decoder, &in );
     if( !p_subpic )
-        return VLC_EGENERIC;
+    {
+        /* We just don't have anything to handle now, go own*/
+        return VLC_SUCCESS;
+    }
 
     if( p_sys->b_master_sync && p_sys->i_master_drift )
     {



More information about the vlc-commits mailing list