fixing rv10 encoding (ffmpeg can at least decode its own rv10 files now)

[ffmpeg] / Makefile

diff --git a/Makefile b/Makefile
index 8d2d7113ca0f9ed6eb2141d666c93b20e05a6ceb..9e2d203ddfd895818518038dc06e727b8d98fc76 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -9,8 +9,10 @@ VPATH=$(SRC_PATH)
 CFLAGS= $(OPTFLAGS) -Wall -g -I. -I$(SRC_PATH) -I$(SRC_PATH)/libavcodec -I$(SRC_PATH)/libav -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
 ifeq ($(CONFIG_DARWIN),yes)
 LDFLAGS+= -g -d
+FFSLDFLAGS= -Wl,-bind_at_load
 else
 LDFLAGS+= -g -Wl,--warn-common
+FFSLDFLAGS= -Wl,-E
 endif
 
 ifeq ($(TARGET_GPROF),yes)
@@ -34,6 +36,9 @@ DEP_LIBS=libavcodec/libavcodec.a libav/libavformat.a
 ifeq ($(CONFIG_MP3LAME),yes)
 EXTRALIBS+=-lmp3lame
 endif
+ifeq ($(CONFIG_VORBIS),yes)
+EXTRALIBS+=-logg -lvorbis -lvorbisenc
+endif
 endif
 
 OBJS = ffmpeg.o ffserver.o
@@ -53,7 +58,8 @@ ffmpeg$(EXE): ffmpeg_g$(EXE)
        $(STRIP) -o $@ $<
 
 ffserver$(EXE): ffserver.o $(DEP_LIBS)
-       $(CC) $(LDFLAGS) -Wl,-E -o $@ ffserver.o -L./libavcodec -L./libav \
+       $(CC) $(LDFLAGS) $(FFSLDFLAGS) \
+               -o $@ ffserver.o -L./libavcodec -L./libav \
               -lavformat -lavcodec -ldl $(EXTRALIBS) 
 
 ffplay: ffmpeg$(EXE)