diff options
| author | Diego Biurrun <diego@biurrun.de> | 2007-04-03 15:59:15 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2007-04-03 15:59:15 +0000 |
| commit | 12631f2dd0dd7af0885f3df3a63b3aa38b3da4ac (patch) | |
| tree | d30d871dcd146f29ae1c13cd5e0a58949a7ddb96 | |
| parent | e011ef1a85f875dfef7eb12494a5f6bd7e780270 (diff) | |
| download | ffmpeg-12631f2dd0dd7af0885f3df3a63b3aa38b3da4ac.tar.gz | |
CONFIG_NETWORK depends on CONFIG_PROTOCOLS, no need to nest conditionals.
Originally committed as revision 8615 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavformat/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/Makefile b/libavformat/Makefile index 2e5fa97937..fc289a3b31 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) |