CONFIG_NETWORK depends on CONFIG_PROTOCOLS, no need to nest conditionals.

Originally committed as revision 8615 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/Makefile b/libavformat/Makefile
index 2e5fa97..fc289a3 100644 (file)
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -164,10 +164,10 @@ OBJS+= avio.o aviobuf.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
-endif
 
 NAME=avformat
 LIBVERSION=$(LAVFVERSION)