Commit da25cc13 authored by diego's avatar diego

CONFIG_NETWORK depends on CONFIG_PROTOCOLS, no need to nest conditionals.


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@8615 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 4279fab0
...@@ -164,10 +164,10 @@ OBJS+= avio.o aviobuf.o ...@@ -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)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment