[vlc-devel] commit: Revert "Allow use of inputs without DEMUX_GET/ SET_*TIME in input-slave." (Antoine Cellerier )

[git version control]

vlc | branch: master | Antoine Cellerier <dionoea at videolan.org> | Sat Jan  3 22:14:57 2009 +0100| [652cd67e01d3618ad15759b1ca84c4b1b93aa68a] | committer: Antoine Cellerier 

Revert "Allow use of inputs without DEMUX_GET/SET_*TIME in input-slave."

This reverts commit 60106b7432e0f6b61689486ba1fadf7c03db5f49.
That patch isn't a correct fix for the problem.

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

 src/input/input.c |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/input/input.c b/src/input/input.c
index 9b8c1e2..8ec2dc6 100644
--- a/src/input/input.c
+++ b/src/input/input.c
@@ -2732,12 +2732,11 @@ static void SlaveDemux( input_thread_t *p_input )
 {
     int64_t i_time;
     int i;
-    bool b_set_time = true;
 
     if( demux_Control( p_input->p->input.p_demux, DEMUX_GET_TIME, &i_time ) )
     {
-        /* msg_Err( p_input, "demux doesn't like DEMUX_GET_TIME" ); */
-        b_set_time = false;
+        msg_Err( p_input, "demux doesn't like DEMUX_GET_TIME" );
+        return;
     }
 
     for( i = 0; i < p_input->p->i_slave; i++ )
@@ -2748,7 +2747,7 @@ static void SlaveDemux( input_thread_t *p_input )
         if( in->b_eof )
             continue;
 
-        if( b_set_time && demux_Control( in->p_demux, DEMUX_SET_NEXT_DEMUX_TIME, i_time ) )
+        if( demux_Control( in->p_demux, DEMUX_SET_NEXT_DEMUX_TIME, i_time ) )
         {
             for( ;; )
             {