--- ffmpeg-0.4.9-p20050226-shared/configure	2005-07-10 22:11:37.000000000 +0200
+++ ./configure	2005-07-10 22:39:08.000000000 +0200
@@ -269,7 +269,8 @@
 extralibs=""
 darwin="yes"
 strip="strip -x"
-LDFLAGS="-Wl,-d,-search_paths_first"
+LDFLAGS="-Wl,-dynamic,-search_paths_first"
+SLIBSUF=".dylib"
 FFSLDFLAGS=-Wl,-bind_at_load
 ;;
 MINGW32*)
@@ -568,6 +568,12 @@
 		   needmdynamicnopic="yes"
 		fi
 		;;
+	    *4.*)
+		CFLAGS="$CFLAGS -no-cpp-precomp -pipe -fomit-frame-pointer -force_cpusubtype_ALL -Wno-sign-compare"
+		if test "$lshared" = no; then
+		   needmdynamicnopic="no"
+		fi
+		;;
 	    *)
 		CFLAGS="$CFLAGS -no-cpp-precomp -pipe -fomit-frame-pointer"
 		if test "$lshared" = no; then
diff -Naur ffmpeg-0.4.9-p20050226-shared/Makefile ./Makefile
--- ffmpeg-0.4.9-p20050226-shared/Makefile	2005-07-10 22:11:38.000000000 +0200
+++ ./Makefile	2005-07-10 22:30:45.000000000 +0200
@@ -118,7 +118,7 @@
 	$(CC) $(LDFLAGS) $(FFSLDFLAGS) -o $@ ffserver.o $(FFLIBS) $(EXTRALIBS) 
 
 ffplay_g$(EXESUF): ffplay.o cmdutils.o .libs
-	$(CC) $(LDFLAGS) -o $@ ffplay.o cmdutils.o $(FFLIBS) $(EXTRALIBS) $(SDL_LIBS)
+	$(CC) $(LDFLAGS) -bind_at_load -o $@ ffplay.o cmdutils.o $(FFLIBS) $(EXTRALIBS) $(SDL_LIBS)
 
 ffplay$(EXESUF): ffplay_g$(EXESUF)
 	cp -p $< $@
diff -Naur ffmpeg-0.4.9-p20050226-shared/libavcodec/Makefile ./libavcodec/Makefile
--- ffmpeg-0.4.9-p20050226-shared/libavcodec/Makefile	2005-07-10 22:11:38.000000000 +0200
+++ ./libavcodec/Makefile	2005-07-10 22:29:42.000000000 +0200
@@ -202,6 +202,7 @@
 
 LIB= $(LIBPREF)avcodec$(LIBSUF)
 ifeq ($(BUILD_SHARED),yes)
+SLIB_INSTALL=$(SLIBPREF)avcodec.0$(SLIBSUF)
 SLIB= $(SLIBPREF)avcodec$(SLIBSUF)
 endif
 TESTS= imgresample-test dct-test motion-test fft-test
@@ -227,6 +228,8 @@
 	-lib /machine:i386 /def:$(@:.dll=.def)
 else
 	$(CC) $(SHFLAGS) -o $@ $(OBJS) $(EXTRALIBS) $(AMREXTRALIBS) $(LDFLAGS)
+	ln -sf $(SLIB) $(SLIBPREF)avcodec.0$(SLIBSUF)
+	ln -sf $(SLIB) $(SLIBPREF)avcodec$(SLIBSUF)
 endif
 
 dsputil.o: dsputil.c dsputil.h
@@ -298,9 +301,7 @@
 	install $(INSTALLSTRIP) -m 755 $(SLIB) "$(prefix)"
 else
 	install -d $(libdir)
-	install $(INSTALLSTRIP) -m 755 $(SLIB) $(libdir)/libavcodec-$(VERSION).so
-	ln -sf libavcodec-$(VERSION).so $(libdir)/libavcodec.so
-	ldconfig || true
+	install -m 755 $(SLIB) $(libdir)/$(SLIB)
 endif
 ifeq ($(CONFIG_PP),yes)
 	$(MAKE) -C libpostproc $@
diff -Naur ffmpeg-0.4.9-p20050226-shared/libavcodec/a52dec.c ./libavcodec/a52dec.c
--- ffmpeg-0.4.9-p20050226-shared/libavcodec/a52dec.c	2005-07-10 22:11:38.000000000 +0200
+++ ./libavcodec/a52dec.c	2005-07-10 22:12:11.000000000 +0200
@@ -27,7 +27,7 @@
 
 #ifdef CONFIG_A52BIN
 #include <dlfcn.h>
-static const char* liba52name = "liba52.so.0";
+static const char* liba52name = "liba52.dylib.0";
 #endif
 
 /**
diff -Naur ffmpeg-0.4.9-p20050226-shared/libavcodec/faad.c ./libavcodec/faad.c
--- ffmpeg-0.4.9-p20050226-shared/libavcodec/faad.c	2005-02-24 20:08:49.000000000 +0100
+++ ./libavcodec/faad.c	2005-07-10 22:11:56.000000000 +0200
@@ -40,7 +40,7 @@
 
 #ifdef CONFIG_FAADBIN
 #include <dlfcn.h>
-static const char* libfaadname = "libfaad.so.0";
+static const char* libfaadname = "libfaad.dylib.0";
 #else
 #define dlopen(a)
 #define dlclose(a)
diff -Naur ../../../ffmpeg-0.4.9_pre1_old/work/ffmpeg/libavcodec/libpostproc/Makefile ./libavcodec/libpostproc/Makefile
--- ../../../ffmpeg-0.4.9_pre1_old/work/ffmpeg/libavcodec/libpostproc/Makefile	Sun May 11 07:26:35 2003
+++ ./libavcodec/libpostproc/Makefile	Sun Mar 20 23:48:11 2005
@@ -4,7 +4,11 @@
 VPATH=$(SRC_PATH)/libavcodec/libpostproc
 
 ifeq ($(SHARED_PP),yes)
-SPPLIB = $(SLIBPREF)postproc$(SLIBSUF)
+ifeq ($(CONFIG_DARWIN),yes)
+	SPPLIB = $(SLIBPREF)postproc
+else
+	SPPLIB = $(SLIBPREF)postproc$(SLIBSUF)
+endif
 SPPVERSION = 0.0.1
 endif
 PPLIB = $(LIBPREF)postproc$(LIBSUF)
@@ -25,10 +29,10 @@
 all:    $(SWSLIB) $(PPLIB) $(SPPLIB)
 
 clean:
-	rm -f *.o *.a *~ *.so $(PPLIB) $(SPPLIB)
+	rm -f *.o *.a *~ *.$(SLIBSUF) $(PPLIB) $(SPPLIB)
 
 distclean:
-	rm -f Makefile.bak *.o *.a *~ *.so .depend
+	rm -f Makefile.bak *.o *.a *~ *.$(SLIBSUF) .depend
 
 dep:    depend
 
@@ -40,9 +44,14 @@
 	$(CC) -c $(CFLAGS) -fomit-frame-pointer -fPIC -DPIC -I.. -I../.. -o $@ $<
 
 $(SPPLIB): $(SPPOBJS)
+ifeq ($(CONFIG_DARWIN),yes)
+	$(CC) -dynamiclib -Wl,-install_name,$(SPPLIB).0.dylib \
+	-o $(SPPLIB).dylib $(SPPOBJS)
+else
 	$(CC) -shared -Wl,-soname,$(SPPLIB).0 \
 	-o $(SPPLIB) $(SPPOBJS)
 endif
+endif
 
 $(PPLIB): $(PPOBJS)
 	rm -f $@
@@ -55,8 +64,13 @@
        install $(INSTALLSTRIP) -m 755 $(SPPLIB) "$(prefix)"
 else
 	install -d $(libdir)
-	install $(INSTALLSTRIP) -m 755 $(SPPLIB) $(libdir)/$(SPPLIB).$(SPPVERSION)
-	ln -sf $(SPPLIB).$(SPPVERSION) $(libdir)/$(SPPLIB)
+ifeq ($(CONFIG_DARWIN),yes)
+	install -m 755 $(SPPLIB)$(SLIBSUF) $(prefix)/lib/$(SPPLIB).$(SPPVERSION)$(SLIBSUF)
+	ln -sf $(SPPLIB).$(SPPVERSION)$(SLIBSUF) $(prefix)/lib/$(SPPLIB)$(SLIBSUF)
+else
+	install -s -m 755 $(SPPLIB) $(prefix)/lib/$(SPPLIB).$(SPPVERSION)
+	ln -sf $(SPPLIB).$(SPPVERSION) $(prefix)/lib/$(SPPLIB)
+endif
 	ldconfig || true
 endif
 endif
diff -Naur ffmpeg-0.4.9-p20050226-shared/libavformat/Makefile ./libavformat/Makefile
--- ffmpeg-0.4.9-p20050226-shared/libavformat/Makefile	2005-07-10 22:11:38.000000000 +0200
+++ ./libavformat/Makefile	2005-07-10 22:29:45.000000000 +0200
@@ -79,6 +79,7 @@
 
 LIB= $(LIBPREF)avformat$(LIBSUF)
 ifeq ($(BUILD_SHARED),yes)
+SLIB_INSTALL=$(SLIBPREF)avformat.0$(SLIBSUF)
 SLIB= $(SLIBPREF)avformat$(SLIBSUF)
 endif
 
@@ -113,9 +114,7 @@
 	install $(INSTALLSTRIP) -m 755 $(SLIB) "$(prefix)"
 else
 	install -d $(libdir)
-	install $(INSTALLSTRIP) -m 755 $(SLIB) $(libdir)/libavformat-$(VERSION).so
-	ln -sf libavformat-$(VERSION).so $(libdir)/libavformat.so
-	ldconfig || true
+	install -m 755 $(SLIB) $(libdir)/$(SLIB)
 endif
 else
 install:
diff -Naur ffmpeg-0.4.9-p20050226-shared/vhook/Makefile ./vhook/Makefile
--- ffmpeg-0.4.9-p20050226-shared/vhook/Makefile	2005-07-10 22:11:37.000000000 +0200
+++ ./vhook/Makefile	2005-07-10 22:25:35.000000000 +0200
@@ -5,7 +5,8 @@
 CFLAGS=-fPIC $(SHCFLAGS) -I.. -I$(SRC_PATH) -I$(SRC_PATH)/libavformat -I$(SRC_PATH)/libavcodec -DHAVE_AV_CONFIG_H
 
 ifeq ($(CONFIG_DARWIN),yes)
-SHFLAGS+=-flat_namespace -undefined suppress
+SHFLAGS=-bundle -avoid-version -undefined dynamic_lookup
+MACOSX_DEPLOYMENT_TARGET=10.3
 endif
 HOOKS=null.so fish.so ppm.so watermark.so
 
@@ -36,7 +36,7 @@
 	$(CC) -g -o $@ $(SHFLAGS) $< `freetype-config --libs`
 
 %.so: %.o
-	$(CC) -g -o $@ $(SHFLAGS) $<
+	$(CC) -g -o $@ $(SHFLAGS) $< -L../libavcodec -lavcodec -L../libavformat -lavformat
 
 clean:
 	rm -f *.o *.d .depend *.so *~