generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ogg has to be at the right of vorbis patch by ("Víctor Paesa" wzrlpy hotmail com)

Browse Source 
Originally committed as revision 4055 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Víctor Paesa
2005-03-18 02:13:13 +00:00
committed by Michael Niedermayer
parent 8bb8f41375
commit 078a8dd66d
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@@ -44,13 +44,13 @@ endif
endif endif
ifeq ($(CONFIG_LIBOGG),yes) ifeq ($(CONFIG_LIBOGG),yes)
EXTRALIBS+= -logg
ifeq ($(CONFIG_LIBVORBIS),yes) ifeq ($(CONFIG_LIBVORBIS),yes)
EXTRALIBS+= -lvorbis -lvorbisenc EXTRALIBS+= -lvorbisenc -lvorbis
endif endif
ifeq ($(CONFIG_LIBTHEORA),yes) ifeq ($(CONFIG_LIBTHEORA),yes)
EXTRALIBS+= -ltheora EXTRALIBS+= -ltheora
endif endif
EXTRALIBS+= -logg
endif endif
ifeq ($(CONFIG_FAAD),yes) ifeq ($(CONFIG_FAAD),yes)

4
libavcodec/Makefile
View File

@@ -125,15 +125,15 @@ EXTRALIBS += -lmp3lame
endif endif
ifeq ($(CONFIG_LIBOGG),yes) ifeq ($(CONFIG_LIBOGG),yes)
EXTRALIBS += -logg
ifeq ($(CONFIG_LIBVORBIS),yes) ifeq ($(CONFIG_LIBVORBIS),yes)
OBJS += oggvorbis.o OBJS += oggvorbis.o
EXTRALIBS += -lvorbis -lvorbisenc EXTRALIBS += -lvorbisenc -lvorbis
endif endif
ifeq ($(CONFIG_LIBTHEORA), yes) ifeq ($(CONFIG_LIBTHEORA), yes)
OBJS += oggtheora.o OBJS += oggtheora.o
EXTRALIBS += -ltheora EXTRALIBS += -ltheora
endif endif
EXTRALIBS += -logg
endif endif
ifeq ($(TARGET_GPROF),yes) ifeq ($(TARGET_GPROF),yes)