Move v4l and pvr into the main access directory.

No need for a separate directory for 1 file

diff --git a/configure.ac b/configure.ac
index 42129eb236f5a230f9489a340e2dc1530ad629a2..5addd658f654f404b1acdd06ac05dd3c109cfb4b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -5489,8 +5489,6 @@ AC_CONFIG_FILES([
   modules/access/dshow/Makefile
   modules/access/dvb/Makefile
   modules/access/mms/Makefile
-  modules/access/pvr/Makefile
-  modules/access/v4l/Makefile
   modules/access/cdda/Makefile
   modules/access/rtsp/Makefile
   modules/access/vcd/Makefile

diff --git a/modules/access/Modules.am b/modules/access/Modules.am
index 09f3457daabf4b2badf100ecd07b69ef8faa3694..948a1be85a1c5d62761eea0791bd71b9574da65a 100644 (file)
--- a/modules/access/Modules.am
+++ b/modules/access/Modules.am
@@ -10,6 +10,8 @@ SOURCES_access_gnomevfs = gnomevfs.c
 SOURCES_dvdnav = dvdnav.c
 SOURCES_dvdread = dvdread.c
 SOURCES_access_fake = fake.c
+SOURCES_pvr = pvr.c videodev2.h
+SOURCES_v4l = v4l.c videodev_mjpeg.h
 SOURCES_cdda = \
         cdda.c \
         vcd/cdrom.c \

diff --git a/modules/access/pvr/pvr.c b/modules/access/pvr.c
similarity index 100%
rename from modules/access/pvr/pvr.c
rename to modules/access/pvr.c

diff --git a/modules/access/pvr/Modules.am b/modules/access/pvr/Modules.am
deleted file mode 100644 (file)
index a9b1591..0000000
--- a/modules/access/pvr/Modules.am
+++ /dev/null
@@ -1 +0,0 @@
-SOURCES_pvr = pvr.c videodev2.h

diff --git a/modules/access/v4l/v4l.c b/modules/access/v4l.c
similarity index 100%
rename from modules/access/v4l/v4l.c
rename to modules/access/v4l.c

diff --git a/modules/access/v4l/Modules.am b/modules/access/v4l/Modules.am
deleted file mode 100644 (file)
index bfdd854..0000000
--- a/modules/access/v4l/Modules.am
+++ /dev/null
@@ -1 +0,0 @@
-SOURCES_v4l = v4l.c videodev_mjpeg.h

diff --git a/modules/access/pvr/videodev2.h b/modules/access/videodev2.h
similarity index 100%
rename from modules/access/pvr/videodev2.h
rename to modules/access/videodev2.h

diff --git a/modules/access/v4l/videodev_mjpeg.h b/modules/access/videodev_mjpeg.h
similarity index 100%
rename from modules/access/v4l/videodev_mjpeg.h
rename to modules/access/videodev_mjpeg.h