vlc | branch: master | Thomas Guillem <tho...@gllm.fr> | Fri Feb 23 17:54:41 
2018 +0100| [fd4646a6d71ce6ea2cc0c06c0991714d85d0bda1] | committer: Thomas 
Guillem

Revert "input: use the original demux for slave synchronisation"

This reverts commit 2a8dda4c43b8967b5d53ee57a4de7f6aa99cff29.A

cf. 2e3120ad713190473134af431db78fbe9b25e033

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

 src/input/input.c          | 3 +--
 src/input/input_internal.h | 3 ---
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/input/input.c b/src/input/input.c
index 8c11d4e0ee..a9e269dc4d 100644
--- a/src/input/input.c
+++ b/src/input/input.c
@@ -2563,7 +2563,6 @@ static input_source_t *InputSourceNew( input_thread_t 
*p_input,
         TAB_CLEAN( count, tab );
     }
 
-    in->p_original_demux =
     in->p_demux = InputDemuxNew( p_input, in, psz_access, psz_demux,
                                  psz_path, psz_anchor );
 
@@ -2770,7 +2769,7 @@ static void SlaveDemux( input_thread_t *p_input )
     int64_t i_time;
     int i;
 
-    if( demux_Control( input_priv(p_input)->master->p_original_demux, 
DEMUX_GET_TIME, &i_time ) )
+    if( demux_Control( input_priv(p_input)->master->p_demux, DEMUX_GET_TIME, 
&i_time ) )
     {
         msg_Err( p_input, "demux doesn't like DEMUX_GET_TIME" );
         return;
diff --git a/src/input/input_internal.h b/src/input/input_internal.h
index 532d3ed81f..16fd662fb3 100644
--- a/src/input/input_internal.h
+++ b/src/input/input_internal.h
@@ -50,9 +50,6 @@ typedef struct
 
     demux_t  *p_demux; /**< Demux object (most downstream) */
 
-    demux_t  *p_original_demux; /**< Unfiltered demux. Can be used to fetch the
-                                * original time for slave synchronisation. */
-
     /* Title infos for that input */
     bool         b_title_demux; /* Titles/Seekpoints provided by demux */
     int          i_title;

_______________________________________________
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

Reply via email to