From: Diego Biurrun <diego@biurrun.de>
Date: Tue, 3 Apr 2007 15:59:15 +0000 (+0000)
Subject: CONFIG_NETWORK depends on CONFIG_PROTOCOLS, no need to nest conditionals.
X-Git-Tag: v0.5~9430
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=12631f2dd0dd7af0885f3df3a63b3aa38b3da4ac;p=platform%2Fupstream%2Flibav.git

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
--- 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)