Mercurial > libavformat.hg

changeset 1691:6efced6e14bf libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
remove no longer needed ifeq tests
author mru
date Sun, 21 Jan 2007 21:06:10 +0000
parents 0c3ad9f59198
children 6db9cc3aabb0
files Makefile
diffstat 1 files changed, 0 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Sun Jan 21 21:04:01 2007 +0000
+++ b/Makefile	Sun Jan 21 21:06:10 2007 +0000
@@ -129,29 +129,21 @@
 
 OBJS+= framehook.o
 
-ifeq ($(CONFIG_X11GRAB),yes)
 OBJS-$(CONFIG_X11_GRAB_DEVICE_DEMUXER)   += x11grab.o
-endif
 
 ifeq ($(CONFIG_VIDEO4LINUX),yes)
 OBJS-$(CONFIG_VIDEO_GRAB_DEVICE_DEMUXER) += grab.o
 endif
 
-ifeq ($(CONFIG_VIDEO4LINUX2),yes)
 OBJS-$(CONFIG_V4L2_DEMUXER)              += v4l2.o
-endif
 
 ifeq ($(CONFIG_BKTR),yes)
 OBJS-$(CONFIG_VIDEO_GRAB_DEVICE_DEMUXER) += grab_bktr.o
 endif
 
-ifeq ($(CONFIG_DV1394),yes)
 OBJS-$(CONFIG_DV1394_DEMUXER)            += dv1394.o
-endif
 
-ifeq ($(CONFIG_DC1394),yes)
 OBJS-$(CONFIG_DC1394_DEMUXER)            += dc1394.o
-endif
 
 ifeq ($(CONFIG_AUDIO_OSS),yes)
 OBJS-$(CONFIG_AUDIO_DEMUXER)             += audio.o
@@ -183,13 +175,9 @@
 #OBJS-$(CONFIG_NUT_MUXER)                 += nutenc.o riff.o
 endif
 
-ifeq ($(CONFIG_LIBOGG),yes)
 OBJS-$(CONFIG_OGG_MUXER)                 += ogg.o
-endif
 
-ifeq ($(CONFIG_GPL),yes)
 OBJS-$(CONFIG_GXF_MUXER)                 += gxfenc.o
-endif
 
 OBJS += $(OBJS-yes)