[vlc-commits] es_out: merge with es_out_timeshift.h

[Thomas Guillem]

vlc | branch: master | Thomas Guillem <thomas at gllm.fr> | Fri Feb 15 14:08:01 2019 +0100| [5246180f6480519b7af197dfc33bf4543e7654ee] | committer: Thomas Guillem

es_out: merge with es_out_timeshift.h

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

 src/Makefile.am              |  1 -
 src/input/es_out.h           |  1 +
 src/input/es_out_timeshift.c |  1 -
 src/input/es_out_timeshift.h | 31 -------------------------------
 src/input/input.c            |  1 -
 5 files changed, 1 insertion(+), 34 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index dc5f2bb238..0b07a8cb76 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -278,7 +278,6 @@ libvlccore_la_SOURCES = \
 	input/decoder.h \
 	input/demux.h \
 	input/es_out.h \
-	input/es_out_timeshift.h \
 	input/event.h \
 	input/item.h \
 	input/mrl_helpers.h \
diff --git a/src/input/es_out.h b/src/input/es_out.h
index c63b4db569..29007bf707 100644
--- a/src/input/es_out.h
+++ b/src/input/es_out.h
@@ -173,5 +173,6 @@ static inline void es_out_Eos( es_out_t *p_out )
 }
 
 es_out_t  *input_EsOutNew( input_thread_t *, int i_rate );
+es_out_t  *input_EsOutTimeshiftNew( input_thread_t *, es_out_t *, int i_rate );
 
 #endif
diff --git a/src/input/es_out_timeshift.c b/src/input/es_out_timeshift.c
index 8095a9da9a..8e6de78b87 100644
--- a/src/input/es_out_timeshift.c
+++ b/src/input/es_out_timeshift.c
@@ -48,7 +48,6 @@
 #include <vlc_block.h>
 #include "input_internal.h"
 #include "es_out.h"
-#include "es_out_timeshift.h"
 
 /*****************************************************************************
  * Local prototypes
diff --git a/src/input/es_out_timeshift.h b/src/input/es_out_timeshift.h
deleted file mode 100644
index a7639ba771..0000000000
--- a/src/input/es_out_timeshift.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*****************************************************************************
- * es_out_timeshift.h: Es Out timeshift.
- *****************************************************************************
- * Copyright (C) 2008 Laurent Aimar
- *
- * Authors: Laurent Aimar < fenrir _AT_ via _DOT_ ecp _DOT_ fr>
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; either version 2.1 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
- *****************************************************************************/
-
-#ifndef LIBVLC_INPUT_ES_OUT_TIMESHIFT_H
-#define LIBVLC_INPUT_ES_OUT_TIMESHIFT_H 1
-
-#include <vlc_common.h>
-
-
-es_out_t *input_EsOutTimeshiftNew( input_thread_t *, es_out_t *, int i_rate );
-
-#endif
diff --git a/src/input/input.c b/src/input/input.c
index c85d08cb43..677a830339 100644
--- a/src/input/input.c
+++ b/src/input/input.c
@@ -37,7 +37,6 @@
 #include "input_internal.h"
 #include "event.h"
 #include "es_out.h"
-#include "es_out_timeshift.h"
 #include "demux.h"
 #include "item.h"
 #include "resource.h"