CONFIG_NETWORK depends on CONFIG_PROTOCOLS, no need to nest conditionals.
authorDiego Biurrun <diego@biurrun.de>
Tue, 3 Apr 2007 15:59:15 +0000 (15:59 +0000)
committerDiego Biurrun <diego@biurrun.de>
Tue, 3 Apr 2007 15:59:15 +0000 (15:59 +0000)
Originally committed as revision 8615 to svn://svn.ffmpeg.org/ffmpeg/trunk

libavformat/Makefile

index 2e5fa97..fc289a3 100644 (file)
@@ -164,10 +164,10 @@ OBJS+= avio.o aviobuf.o
 
 ifeq ($(CONFIG_PROTOCOLS),yes)
 OBJS+= file.o
 
 ifeq ($(CONFIG_PROTOCOLS),yes)
 OBJS+= file.o
+endif
 ifeq ($(CONFIG_NETWORK),yes)
 OBJS+= udp.o tcp.o http.o rtsp.o rtp.o rtpproto.o mpegts.o rtp_h264.o
 endif
 ifeq ($(CONFIG_NETWORK),yes)
 OBJS+= udp.o tcp.o http.o rtsp.o rtp.o rtpproto.o mpegts.o rtp_h264.o
 endif
-endif
 
 NAME=avformat
 LIBVERSION=$(LAVFVERSION)
 
 NAME=avformat
 LIBVERSION=$(LAVFVERSION)