summaryrefslogtreecommitdiff
path: root/libavcodec/Makefile
diff options
context:
space:
mode:
authorNilesh Bansal <nileshbansal@gmail.com>2005-02-24 15:18:02 +0000
committerMichael Niedermayer <michaelni@gmx.at>2005-02-24 15:18:02 +0000
commit5c5dea3f0c495e371faa2962cde83dc187bdf2e4 (patch)
tree79114f92e1f67bd8b55a24423132f2debebf3082 /libavcodec/Makefile
parent738386a5ed5eff0dbad36c33ff96b3b3d4d80af6 (diff)
01-makefile_fix_updated.patch
Adds --enable-theora/--enable-vorbis/--enable-ogg to configure If compiled WITHOUT --enable-theora, native VP3 decoder is used patch by (Nilesh Bansal <nileshbansal gmail com>) Originally committed as revision 3975 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/Makefile')
-rw-r--r--libavcodec/Makefile9
1 files changed, 8 insertions, 1 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 3b424d8c09..1df461711e 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -118,10 +118,17 @@ OBJS += mp3lameaudio.o
EXTRALIBS += -lmp3lame
endif
-ifeq ($(CONFIG_VORBIS),yes)
+ifeq ($(CONFIG_LIBOGG),yes)
+EXTRALIBS += -logg
+ifeq ($(CONFIG_LIBVORBIS),yes)
OBJS += oggvorbis.o
EXTRALIBS += -lvorbis -lvorbisenc
endif
+ifeq ($(CONFIG_LIBTHEORA), yes)
+OBJS += oggtheora.o
+EXTRALIBS += -ltheora
+endif
+endif
ifeq ($(TARGET_GPROF),yes)
CFLAGS+=-p