virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity

Get rid of unnecessary conditionals.

Browse Source 
Originally committed as revision 8617 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Diego Biurrun 2007-04-03 16:33:04 +00:00
parent 2d93bcc784
commit 7b17ad84be
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libavformat/Makefile
View File

@ -155,19 +155,14 @@ endif
EXTRALIBS := -L$(BUILD_ROOT)/libavutil -lavutil$(BUILDSUF) \ EXTRALIBS := -L$(BUILD_ROOT)/libavutil -lavutil$(BUILDSUF) \
-lavcodec$(BUILDSUF) -L$(BUILD_ROOT)/libavcodec $(EXTRALIBS) -lavcodec$(BUILDSUF) -L$(BUILD_ROOT)/libavcodec $(EXTRALIBS)
ifeq ($(CONFIG_AUDIO_BEOS),yes) CPPOBJS-$(CONFIG_AUDIO_BEOS) += beosaudio.o
CPPOBJS+= beosaudio.o
endif
# protocols I/O # protocols I/O
OBJS+= avio.o aviobuf.o OBJS+= avio.o aviobuf.o
ifeq ($(CONFIG_PROTOCOLS),yes) OBJS-$(CONFIG_PROTOCOLS) += file.o
OBJS+= file.o OBJS-$(CONFIG_NETWORK) += udp.o tcp.o http.o rtsp.o rtp.o \
endif rtpproto.o mpegts.o rtp_h264.o
ifeq ($(CONFIG_NETWORK),yes)
OBJS+= udp.o tcp.o http.o rtsp.o rtp.o rtpproto.o mpegts.o rtp_h264.o
endif
NAME=avformat NAME=avformat
LIBVERSION=$(LAVFVERSION) LIBVERSION=$(LAVFVERSION)