From 12631f2dd0dd7af0885f3df3a63b3aa38b3da4ac Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Tue, 3 Apr 2007 15:59:15 +0000 Subject: [PATCH] CONFIG_NETWORK depends on CONFIG_PROTOCOLS, no need to nest conditionals. Originally committed as revision 8615 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/Makefile b/libavformat/Makefile index 2e5fa97..fc289a3 100644 --- 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) -- 2.7.4