Browse Source

CONFIG_NETWORK depends on CONFIG_PROTOCOLS, no need to nest conditionals.

Originally committed as revision 8615 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diego Biurrun 18 years ago
parent
commit
12631f2dd0
1 changed files with 1 additions and 1 deletions
  1. 1 1
      libavformat/Makefile

+ 1 - 1
libavformat/Makefile

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