Remove MPEGPS/V4L support

tvheadend · Mar 23, 2015 · 6cd5f1b · 6cd5f1b
1 parent dddc424
commit 6cd5f1b
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 884 deletions.
diff --git a/configure b/configure
@@ -19,7 +19,6 @@ OPTIONS=(
   "cwc:yes"
   "capmt:yes"
   "constcw:yes"
-  "v4l:no"
   "linuxdvb:yes"
   "satip_server:yes"
   "satip_client:yes"
@@ -465,10 +464,9 @@ if [ ${PLATFORM} = "freebsd" ] || [ ${PLATFORM} = "darwin" ]; then
 fi
 
 #
-# MPEGTS/PS support
+# MPEGTS support
 #
 disable mpegts
-disable mpegps
 disable mpegts_dvb
 if enabled linuxdvb || enabled iptv || enabled tsfile || enabled satip_client || \
    enabled hdhomerun_client || enabled satip_server;
@@ -479,10 +477,6 @@ if enabled linuxdvb || enabled satip_client || enabled hdhomerun_client || enabl
   enable mpegts_dvb
 fi
 
-if enabled v4l; then
-  enable mpegps
-fi
-
 #
 # DBus
 #

diff --git a/src/input.h b/src/input.h
@@ -124,10 +124,6 @@ void tvh_input_stream_destroy ( tvh_input_stream_t *st );
  * Input subsystem includes
  */
 
-#if ENABLE_MPEGPS
-#include "input/mpegps.h"
-#endif
-
 #if ENABLE_MPEGTS
 #include "input/mpegts.h"
 #include "input/mpegts/mpegts_mux_sched.h"

diff --git a/src/input/mpegps/v4l.h b/src/input/mpegps/v4l.h