Mercurial > libavformat.hg

diff Makefile @ 1982:1805da944f22 libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
There were two files, libavformat/grab.c and libavformat/grab_bktr.c declaring the video_grab_device_demuxer AVInputFormat. Use two different names for the AVInputFormats to reduce confusion and remove ugliness from the Makefile.
author diego
date Tue, 03 Apr 2007 21:09:36 +0000
parents 5b1369c8bd36
children 1d9048ba2ce3
line wrap: on
line diff
--- a/Makefile	Tue Apr 03 16:47:43 2007 +0000
+++ b/Makefile	Tue Apr 03 21:09:36 2007 +0000
@@ -144,13 +144,8 @@
 
 OBJS+= framehook.o
 
-ifeq ($(CONFIG_V4L),yes)
-OBJS-$(CONFIG_VIDEO_GRAB_DEVICE_DEMUXER) += grab.o
-endif
-
-ifeq ($(CONFIG_BKTR),yes)
-OBJS-$(CONFIG_VIDEO_GRAB_DEVICE_DEMUXER) += grab_bktr.o
-endif
+OBJS-$(CONFIG_VIDEO_GRAB_V4L_DEMUXER)    += grab.o
+OBJS-$(CONFIG_VIDEO_GRAB_BKTR_DEMUXER)   += grab_bktr.o
 
 EXTRALIBS := -L$(BUILD_ROOT)/libavutil -lavutil$(BUILDSUF) \
              -lavcodec$(BUILDSUF) -L$(BUILD_ROOT)/libavcodec $(EXTRALIBS)