Commit 7a6d2e0e authored by michael's avatar michael

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


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@4055 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 80600629
...@@ -44,13 +44,13 @@ endif ...@@ -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)
......
...@@ -125,15 +125,15 @@ EXTRALIBS += -lmp3lame ...@@ -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)
......
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