[vlc-devel] commit: Fixed sout #display. (Laurent Aimar )

git version control git at videolan.org
Tue Sep 30 22:30:58 CEST 2008


vlc | branch: master | Laurent Aimar <fenrir at videolan.org> | Sun Sep 28 15:36:29 2008 +0200| [a3b364aaf744d085502da72c62ac6eb1e41e5172] | committer: Laurent Aimar 

Fixed sout #display.

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

 src/input/decoder.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/input/decoder.c b/src/input/decoder.c
index 51abd40..5d3e86b 100644
--- a/src/input/decoder.c
+++ b/src/input/decoder.c
@@ -153,7 +153,8 @@ mtime_t decoder_GetDisplayDate( decoder_t *p_dec, mtime_t i_ts )
 {
     decoder_owner_sys_t *p_owner = p_dec->p_owner;
 
-    assert( p_owner->p_clock );
+    if( !p_owner->p_clock )
+        return i_ts;
     return input_clock_GetTS( p_owner->p_clock, p_owner->p_input->i_pts_delay, i_ts );
 }
 /* decoder_GetDisplayRate:
@@ -162,7 +163,8 @@ int decoder_GetDisplayRate( decoder_t *p_dec )
 {
     decoder_owner_sys_t *p_owner = p_dec->p_owner;
 
-    assert( p_owner->p_clock );
+    if( !p_owner->p_clock )
+        return INPUT_RATE_DEFAULT;
     return input_clock_GetRate( p_owner->p_clock );
 }
 




More information about the vlc-devel mailing list