Commit fb1dcab3 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

pvr: remove the old ivtv module

This is a basically subset of the v4l2 access.
parent 70b74020
...@@ -114,6 +114,7 @@ Removed modules: ...@@ -114,6 +114,7 @@ Removed modules:
* portaudio audio output: use the native audio output instead * portaudio audio output: use the native audio output instead
* X11 On Screen Display notifications (xosd) * X11 On Screen Display notifications (xosd)
* Linux Framebuffer On Screen Display interface (fbosd) * Linux Framebuffer On Screen Display interface (fbosd)
* PVR: IVTV analog TV encoder - use V4L instead
* RTMP access: use libavformat avio instead * RTMP access: use libavformat avio instead
* RTMP access_output: use libavformat avio instead * RTMP access_output: use libavformat avio instead
* Hildon GUI * Hildon GUI
......
...@@ -1726,19 +1726,12 @@ dnl Video4Linux 2 ...@@ -1726,19 +1726,12 @@ dnl Video4Linux 2
dnl dnl
AC_ARG_ENABLE(v4l2, [AS_HELP_STRING([--disable-v4l2], AC_ARG_ENABLE(v4l2, [AS_HELP_STRING([--disable-v4l2],
[disable Video4Linux version 2 (default auto)])]) [disable Video4Linux version 2 (default auto)])])
AC_ARG_ENABLE(pvr, [AS_HELP_STRING([--enable-pvr],
[support PVR V4L2 cards (default disabled)])])
have_v4l2="no" have_v4l2="no"
AS_IF([test "$enable_v4l2" != "no"], [ AS_IF([test "$enable_v4l2" != "no"], [
AC_CHECK_HEADERS([linux/videodev2.h sys/videoio.h], [ AC_CHECK_HEADERS([linux/videodev2.h sys/videoio.h], [
have_v4l2="yes" have_v4l2="yes"
]) ])
]) ])
AS_IF([test "$have_v4l2" = "yes"], [
AS_IF([test "${enable_pvr}" = "yes"], [
VLC_ADD_PLUGIN([pvr])
])
])
AM_CONDITIONAL(HAVE_V4L2, [test "${have_v4l2}" != "no"]) AM_CONDITIONAL(HAVE_V4L2, [test "${have_v4l2}" != "no"])
dnl dnl
......
...@@ -256,7 +256,6 @@ $Id$ ...@@ -256,7 +256,6 @@ $Id$
* pulsesrc: PulseAudio audio input * pulsesrc: PulseAudio audio input
* puzzle: puzzle video filter * puzzle: puzzle video filter
* pva: PVA demuxer * pva: PVA demuxer
* pvr: input module to read from a PVR card
* qt4: interface module using the cross-platform Qt4 library * qt4: interface module using the cross-platform Qt4 library
* qtcapture: Quicktime Video Capture * qtcapture: Quicktime Video Capture
* qtsound: Quicktime Audio Capture * qtsound: Quicktime Audio Capture
......
...@@ -41,7 +41,6 @@ SOURCES_access_gnomevfs = gnomevfs.c ...@@ -41,7 +41,6 @@ SOURCES_access_gnomevfs = gnomevfs.c
SOURCES_access_eyetv = eyetv.m SOURCES_access_eyetv = eyetv.m
SOURCES_dc1394 = dc1394.c SOURCES_dc1394 = dc1394.c
SOURCES_dv1394 = dv.c SOURCES_dv1394 = dv.c
SOURCES_pvr = pvr.c
SOURCES_linsys_sdi = linsys/linsys_sdi.c linsys/linsys_sdi.h SOURCES_linsys_sdi = linsys/linsys_sdi.c linsys/linsys_sdi.h
SOURCES_linsys_hdsdi = \ SOURCES_linsys_hdsdi = \
linsys/linsys_hdsdi.c \ linsys/linsys_hdsdi.c \
......
This diff is collapsed.
...@@ -233,7 +233,6 @@ modules/access_output/livehttp.c ...@@ -233,7 +233,6 @@ modules/access_output/livehttp.c
modules/access_output/shout.c modules/access_output/shout.c
modules/access_output/udp.c modules/access_output/udp.c
modules/access/pulse.c modules/access/pulse.c
modules/access/pvr.c
modules/access/qtcapture.m modules/access/qtcapture.m
modules/access/rar/access.c modules/access/rar/access.c
modules/access/rar/rar.c modules/access/rar/rar.c
......
...@@ -947,7 +947,6 @@ static int GuessType( const input_item_t *p_item ) ...@@ -947,7 +947,6 @@ static int GuessType( const input_item_t *p_item )
{ "ofdm", ITEM_TYPE_CARD }, { "ofdm", ITEM_TYPE_CARD },
{ "oss", ITEM_TYPE_CARD }, { "oss", ITEM_TYPE_CARD },
{ "pnm", ITEM_TYPE_NET }, { "pnm", ITEM_TYPE_NET },
{ "pvr", ITEM_TYPE_CARD },
{ "qam", ITEM_TYPE_CARD }, { "qam", ITEM_TYPE_CARD },
{ "qpsk", ITEM_TYPE_CARD }, { "qpsk", ITEM_TYPE_CARD },
{ "qtcapt", ITEM_TYPE_CARD }, /* qtcapture */ { "qtcapt", ITEM_TYPE_CARD }, /* qtcapture */
......
...@@ -1846,7 +1846,6 @@ vlc_module_begin () ...@@ -1846,7 +1846,6 @@ vlc_module_begin ()
add_obsolete_integer( "linsys-hdsdi-caching" ) /* 2.0.0 */ add_obsolete_integer( "linsys-hdsdi-caching" ) /* 2.0.0 */
add_obsolete_integer( "linsys-sdi-caching" ) /* 2.0.0 */ add_obsolete_integer( "linsys-sdi-caching" ) /* 2.0.0 */
add_obsolete_integer( "oss-caching" ) /* 2.0.0 */ add_obsolete_integer( "oss-caching" ) /* 2.0.0 */
add_obsolete_integer( "pvr-caching" ) /* 2.0.0 */
add_obsolete_integer( "screen-caching" ) /* 2.0.0 */ add_obsolete_integer( "screen-caching" ) /* 2.0.0 */
add_obsolete_integer( "v4l2-caching" ) /* 2.0.0 */ add_obsolete_integer( "v4l2-caching" ) /* 2.0.0 */
add_integer( "disc-caching", DEFAULT_PTS_DELAY / 1000, add_integer( "disc-caching", DEFAULT_PTS_DELAY / 1000,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment