Commit 078a8dd6 authored by Víctor Paesa's avatar Víctor Paesa Committed by Michael Niedermayer

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

Originally committed as revision 4055 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 8bb8f413
......@@ -44,13 +44,13 @@ endif
endif
ifeq ($(CONFIG_LIBOGG),yes)
EXTRALIBS+= -logg
ifeq ($(CONFIG_LIBVORBIS),yes)
EXTRALIBS+= -lvorbis -lvorbisenc
EXTRALIBS+= -lvorbisenc -lvorbis
endif
ifeq ($(CONFIG_LIBTHEORA),yes)
EXTRALIBS+= -ltheora
endif
EXTRALIBS+= -logg
endif
ifeq ($(CONFIG_FAAD),yes)
......
......@@ -125,15 +125,15 @@ EXTRALIBS += -lmp3lame
endif
ifeq ($(CONFIG_LIBOGG),yes)
EXTRALIBS += -logg
ifeq ($(CONFIG_LIBVORBIS),yes)
OBJS += oggvorbis.o
EXTRALIBS += -lvorbis -lvorbisenc
EXTRALIBS += -lvorbisenc -lvorbis
endif
ifeq ($(CONFIG_LIBTHEORA), yes)
OBJS += oggtheora.o
EXTRALIBS += -ltheora
endif
EXTRALIBS += -logg
endif
ifeq ($(TARGET_GPROF),yes)
......
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