summaryrefslogtreecommitdiff
path: root/v4l
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <devnull@localhost>2005-11-09 01:30:01 +0000
committerMauro Carvalho Chehab <devnull@localhost>2005-11-09 01:30:01 +0000
commit439e1c748841e6148a652ba61da6aafe3f1d0ea8 (patch)
tree2e0578debe67ecbe92d3959f72322ed6953325a2 /v4l
parent015ef58fba65fe435c229caf3cce513d7058915a (diff)
downloadmediapointer-dvb-s2-439e1c748841e6148a652ba61da6aafe3f1d0ea8.tar.gz
mediapointer-dvb-s2-439e1c748841e6148a652ba61da6aafe3f1d0ea8.tar.bz2
Added new video decoders to makefile.
- Added new video decoders to makefile. Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Diffstat (limited to 'v4l')
-rw-r--r--v4l/ChangeLog9
-rw-r--r--v4l/Make.config3
-rw-r--r--v4l/Makefile3
3 files changed, 14 insertions, 1 deletions
diff --git a/v4l/ChangeLog b/v4l/ChangeLog
index 1d44a21fd..afb75891f 100644
--- a/v4l/ChangeLog
+++ b/v4l/ChangeLog
@@ -1,3 +1,12 @@
+2005-11-09 01:27 mchehab
+
+ * ../v4l/Make.config:
+ * ../v4l/Makefile:
+
+ - Added new video decoders to makefile.
+
+ Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
+
2005-11-09 00:56 mchehab
* ../linux/drivers/media/video/cx25840/cx25840-audio.c:
diff --git a/v4l/Make.config b/v4l/Make.config
index 90bb2224f..3b34f7dcf 100644
--- a/v4l/Make.config
+++ b/v4l/Make.config
@@ -12,8 +12,9 @@ CONFIG_TVP5150 := m
CONFIG_SAA711X := m
CONFIG_EM28XX := m
-CONFIG_VIDEO_ALSA := n
+CONFIG_VIDEO_DECODER := m
+CONFIG_VIDEO_ALSA := n
CONFIG_VIDEO_ADV_DEBUG := y
# doesn't build on kernels older than 2.6.12
diff --git a/v4l/Makefile b/v4l/Makefile
index 2f5081b14..7405d0302 100644
--- a/v4l/Makefile
+++ b/v4l/Makefile
@@ -30,6 +30,8 @@ tuner-objs := tuner-core.o tuner-simple.o mt20xx.o tda8290.o tea5767.o
list-multi := bttv.o saa7134.o cx88xx.o cx8800.o cx88-alsa.o cx8802.o
em28xx-objs := em28xx-video.o em28xx-i2c.o em28xx-cards.o em28xx-core.o \
em28xx-input.o
+cx25840-objs := cx25840-core.o cx25840-audio.o cx25840-firmware.o \
+ cx25840-vbi.o
# what to build
obj-m := video-buf.o v4l1-compat.o v4l2-common.o
@@ -39,6 +41,7 @@ obj-$(CONFIG_VIDEO_CX88) += btcx-risc.o cx88xx.o cx8800.o cx8802.o \
obj-$(CONFIG_TVP5150) += tvp5150.o
obj-$(CONFIG_SAA711X) += saa711x.o
obj-$(CONFIG_EM28XX) += em28xx.o
+obj-$(CONFIG_VIDEO_DECODER) += saa7115.o cx25840.o saa7127.o
# THIS IS NOT FINISHED YET --- IT IS HERE ONLY FOR DEVELOPERS !!!!
ifeq ($(CONFIG_VIDEO_ALSA),m)