Originally committed as revision 4055 to svn://svn.ffmpeg.org/ffmpeg/trunktags/v0.5
@@ -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 | |||||
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) | ||||