Browse Source

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
tags/v0.5
Víctor Paesa Michael Niedermayer 20 years ago
parent
commit
078a8dd66d
2 changed files with 4 additions and 4 deletions
  1. +2
    -2
      Makefile
  2. +2
    -2
      libavcodec/Makefile

+ 2
- 2
Makefile View File

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


+ 2
- 2
libavcodec/Makefile View File

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