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

Properly remove the old dvb plugin, fix bootstrapping

(I do not know why it was removed in the first place though - not me!
 As a consequence, we cannot scan TV channels in VLC >= 2.0...)
(cherry picked from commit d0413f1d8b0f16001a6c0820a081ce81fedf6b65)

Conflicts:

	modules/access/Modules.am
parent e91fe501
...@@ -4220,7 +4220,6 @@ AC_CONFIG_FILES([ ...@@ -4220,7 +4220,6 @@ AC_CONFIG_FILES([
modules/access/Makefile modules/access/Makefile
modules/access/bd/Makefile modules/access/bd/Makefile
modules/access/dshow/Makefile modules/access/dshow/Makefile
modules/access/dvb/Makefile
modules/access/mms/Makefile modules/access/mms/Makefile
modules/access/rtp/Makefile modules/access/rtp/Makefile
modules/access/rtsp/Makefile modules/access/rtsp/Makefile
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
LIBTOOL=@LIBTOOL@ --tag=CC LIBTOOL=@LIBTOOL@ --tag=CC
BASE_SUBDIRS = mms rtp rtsp vcd vcdx screen bd zip BASE_SUBDIRS = mms rtp rtsp vcd vcdx screen bd zip
EXTRA_SUBDIRS = dshow dvb EXTRA_SUBDIRS = dshow
SUBDIRS = $(BASE_SUBDIRS) SUBDIRS = $(BASE_SUBDIRS)
DIST_SUBDIRS = $(BASE_SUBDIRS) $(EXTRA_SUBDIRS) DIST_SUBDIRS = $(BASE_SUBDIRS) $(EXTRA_SUBDIRS)
......
EXTRA_DIST += \
access.c \
http.c \
linux_dvb.c \
scan.c scan.h \
dvb.h \
$(NULL)
...@@ -202,7 +202,6 @@ modules/access/dshow/dshow.cpp ...@@ -202,7 +202,6 @@ modules/access/dshow/dshow.cpp
modules/access/dshow/filter.cpp modules/access/dshow/filter.cpp
modules/access/dshow/filter.h modules/access/dshow/filter.h
modules/access/dtv/access.c modules/access/dtv/access.c
modules/access/dvb/access.c
modules/access/dv.c modules/access/dv.c
modules/access/dvdnav.c modules/access/dvdnav.c
modules/access/dvdread.c modules/access/dvdread.c
......
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