Move v4l2.c back to the access/ directory

(No more splitting up planed in the forseable future)

diff --git a/configure.ac b/configure.ac
index 540c7fdf31541f0d410706017c15c26cc4ac4307..4899ba211f961e16b995ce9d24f69b6d4e3fd2f4 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -5824,7 +5824,6 @@ AC_CONFIG_FILES([
   modules/access/rtp/Makefile
   modules/access/rtsp/Makefile
   modules/access/rtmp/Makefile
-  modules/access/v4l2/Makefile
   modules/access/vcd/Makefile
   modules/access/vcdx/Makefile
   modules/access/screen/Makefile

diff --git a/modules/access/Modules.am b/modules/access/Modules.am
index 2e696f4eb14eeb7c7e43c72c742b4f1159bb8785..971b93b5652f50e9ee8effa6fd7f15ce0be6177e 100644 (file)
--- a/modules/access/Modules.am
+++ b/modules/access/Modules.am
@@ -3,7 +3,7 @@
 # obviously does not. Here is a fix for that.
 LIBTOOL=@LIBTOOL@ --tag=CC
 
-BASE_SUBDIRS = dvb mms cdda rtp rtsp rtmp v4l2 vcd vcdx screen
+BASE_SUBDIRS = dvb mms cdda rtp rtsp rtmp vcd vcdx screen
 EXTRA_SUBDIRS = bda dshow
 SUBDIRS = $(BASE_SUBDIRS)
 DIST_SUBDIRS = $(BASE_SUBDIRS) $(EXTRA_SUBDIRS)
@@ -29,6 +29,7 @@ SOURCES_dc1394 = dc1394.c
 SOURCES_access_fake = fake.c
 SOURCES_pvr = pvr.c videodev2.h
 SOURCES_v4l = v4l.c videodev_mjpeg.h
+SOURCES_v4l2 = v4l2.c
 SOURCES_qtcapture = qtcapture.m
 SOURCES_cdda = \
         cdda.c \

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

diff --git a/modules/access/v4l2/Modules.am b/modules/access/v4l2/Modules.am
deleted file mode 100644 (file)
index 80d1c8f..0000000
--- a/modules/access/v4l2/Modules.am
+++ /dev/null
@@ -1 +0,0 @@
-SOURCES_v4l2 = v4l2.c