[vlc-commits] Fixed reseting audio/spu delay to 0.

Laurent Aimar git at videolan.org
Fri Oct 7 22:26:24 CEST 2011


vlc | branch: master | Laurent Aimar <fenrir at videolan.org> | Fri Oct  7 20:56:53 2011 +0200| [4b42c9963c8c01b10f68086aed2ffe2f5bfa9425] | committer: Laurent Aimar

Fixed reseting audio/spu delay to 0.

It was previously ignored.

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

 src/input/es_out.c |   13 ++++++-------
 1 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/input/es_out.c b/src/input/es_out.c
index dd29f63..760e57b 100644
--- a/src/input/es_out.c
+++ b/src/input/es_out.c
@@ -769,14 +769,13 @@ static void EsOutDecoderChangeDelay( es_out_t *out, es_out_id_t *p_es )
         i_delay = p_sys->i_audio_delay;
     else if( p_es->fmt.i_cat == SPU_ES )
         i_delay = p_sys->i_spu_delay;
+    else
+        return;
 
-    if( i_delay != 0 )
-    {
-        if( p_es->p_dec )
-            input_DecoderChangeDelay( p_es->p_dec, i_delay );
-        if( p_es->p_dec_record )
-            input_DecoderChangeDelay( p_es->p_dec_record, i_delay );
-    }
+    if( p_es->p_dec )
+        input_DecoderChangeDelay( p_es->p_dec, i_delay );
+    if( p_es->p_dec_record )
+        input_DecoderChangeDelay( p_es->p_dec_record, i_delay );
 }
 static void EsOutProgramsChangeRate( es_out_t *out )
 {



More information about the vlc-commits mailing list