virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-11-06 08:29:25 +02:00
Code Issues Releases Activity

Move all definitions of external dependencies into configure instead of

Browse Source 
defining it in configure and the Makefiles in a random fashion.
patch by j -- at -- v2v -- dot -- cc

Originally committed as revision 4628 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
j@v2v.cc
2005-10-04 11:19:08 +00:00
committed by Diego Biurrun
parent 5af837972c
commit c99dd23307
4 changed files with 25 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
libavcodec/Makefile
View File

@@ -240,32 +240,22 @@ EXTRALIBS += -L../libavutil -lavutil$(BUILDSUF)
# currently using libdts for dts decoding
ifeq ($(CONFIG_DTS),yes)
OBJS+= dtsdec.o
CFLAGS += $(DTS_INC)
EXTRALIBS += -ldts
endif
ifeq ($(CONFIG_FAAD),yes)
OBJS+= faad.o
ifeq ($(CONFIG_FAADBIN),yes)
# no libs needed
else
EXTRALIBS += -lfaad
endif
endif
ifeq ($(CONFIG_FAAC),yes)
OBJS+= faac.o
EXTRALIBS += -lfaac
endif
ifeq ($(CONFIG_XVID),yes)
OBJS+= xvidff.o
EXTRALIBS += -lxvidcore
endif
ifeq ($(CONFIG_X264),yes)
OBJS+= x264.o
EXTRALIBS += -lx264
endif
ifeq ($(CONFIG_PP),yes)
@@ -279,24 +269,19 @@ endif
ifeq ($(CONFIG_MP3LAME),yes)
OBJS += mp3lameaudio.o
EXTRALIBS += -lmp3lame
endif
ifeq ($(CONFIG_LIBOGG),yes)
ifeq ($(CONFIG_LIBVORBIS),yes)
OBJS += oggvorbis.o
EXTRALIBS += -lvorbisenc -lvorbis
endif
ifeq ($(CONFIG_LIBTHEORA), yes)
OBJS += oggtheora.o
EXTRALIBS += -ltheora
endif
EXTRALIBS += -logg
endif
ifeq ($(CONFIG_LIBGSM),yes)
OBJS += libgsm.o
EXTRALIBS += -lgsm
endif
ifeq ($(TARGET_GPROF),yes)