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
pull/126/head
Víctor Paesa 20 years ago committed by Michael Niedermayer
parent 8bb8f41375
commit 078a8dd66d
  1. 4
      Makefile
  2. 4
      libavcodec/Makefile

@ -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)

Loading…
Cancel
Save