--- ffmpeg-0.4.9-p20050226-orig/Makefile	2005-02-24 10:18:02.000000000 -0500
+++ ffmpeg-0.4.9-p20050226-orig/Makefile	2005-03-18 17:48:45.000000000 -0500
@@ -73,6 +73,10 @@ 
 EXTRALIBS+=-ldc1394_control -lraw1394
 endif
 
+ifeq ($(CONFIG_A52BIN),yes)
+EXTRALIBS+=-la52
+endif
+
 ifeq ($(BUILD_VHOOK),yes)
 VHOOK=videohook
 INSTALLVHOOK=install-vhook
--- ffmpeg-0.4.9-p20050226-orig/Makefile.orig	1969-12-31 19:00:00.000000000 -0500
+++ ffmpeg-0.4.9-p20050226-orig/Makefile.orig	2005-02-24 10:18:02.000000000 -0500
@@ -0,0 +1,221 @@ 
+#
+# Main ffmpeg Makefile
+# (c) 2000-2004 Fabrice Bellard
+#
+include config.mak
+
+VPATH=$(SRC_PATH)
+
+CFLAGS=$(OPTFLAGS) -I. -I$(SRC_PATH) -I$(SRC_PATH)/libavcodec -I$(SRC_PATH)/libavformat -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
+LDFLAGS+= -g 
+
+ifeq ($(TARGET_GPROF),yes)
+CFLAGS+=-p
+LDFLAGS+=-p
+endif
+
+MANPAGE=doc/ffmpeg.1
+PROG=ffmpeg$(EXESUF)
+PROGTEST=output_example$(EXESUF)
+QTFASTSTART=qt-faststart$(EXESUF)
+
+ifeq ($(CONFIG_FFSERVER),yes)
+MANPAGE+=doc/ffserver.1
+PROG+=ffserver$(EXESUF)
+endif
+
+ifeq ($(CONFIG_FFPLAY),yes)
+MANPAGE+=doc/ffplay.1
+PROG+=ffplay$(EXESUF)
+FFPLAY_O=ffplay.o
+endif
+
+ifeq ($(CONFIG_AUDIO_BEOS),yes)
+EXTRALIBS+=-lmedia -lbe
+endif
+
+ifeq ($(BUILD_SHARED),yes)
+DEP_LIBS=libavcodec/$(SLIBPREF)avcodec$(SLIBSUF) libavformat/$(SLIBPREF)avformat$(SLIBSUF)
+else
+DEP_LIBS=libavcodec/$(LIBPREF)avcodec$(LIBSUF) libavformat/$(LIBPREF)avformat$(LIBSUF)
+ifeq ($(CONFIG_MP3LAME),yes)
+EXTRALIBS+=-lmp3lame
+endif
+endif
+
+ifeq ($(CONFIG_LIBOGG),yes)
+EXTRALIBS+= -logg 
+ifeq ($(CONFIG_LIBVORBIS),yes)
+EXTRALIBS+= -lvorbis -lvorbisenc
+endif
+ifeq ($(CONFIG_LIBTHEORA),yes)
+EXTRALIBS+= -ltheora
+endif
+endif
+
+ifeq ($(CONFIG_FAAD),yes)
+ifeq ($(CONFIG_FAADBIN),yes)
+# no libs needed
+else
+EXTRALIBS += -lfaad
+endif
+endif
+
+ifeq ($(CONFIG_FAAC),yes)
+EXTRALIBS+=-lfaac
+endif
+
+ifeq ($(CONFIG_XVID),yes)
+EXTRALIBS+=-lxvidcore
+endif
+
+ifeq ($(CONFIG_DC1394),yes)
+EXTRALIBS+=-ldc1394_control -lraw1394
+endif
+
+ifeq ($(BUILD_VHOOK),yes)
+VHOOK=videohook
+INSTALLVHOOK=install-vhook
+CLEANVHOOK=clean-vhook
+endif
+
+ifeq ($(TARGET_OS), SunOS)
+TEST=/usr/bin/test
+else
+TEST=test
+endif
+
+ifeq ($(BUILD_DOC),yes)
+DOC=documentation
+endif
+
+OBJS = ffmpeg.o ffserver.o cmdutils.o $(FFPLAY_O)
+SRCS = $(OBJS:.o=.c) $(ASM_OBJS:.o=.s)
+FFLIBS = -L./libavformat -lavformat -L./libavcodec -lavcodec
+
+all: lib $(PROG) $(PROGTEST) $(VHOOK) $(QTFASTSTART) $(DOC)
+
+lib:
+	$(MAKE) -C libavcodec all
+	$(MAKE) -C libavformat all
+
+ffmpeg_g$(EXESUF): ffmpeg.o cmdutils.o .libs
+	$(CC) $(LDFLAGS) -o $@ ffmpeg.o cmdutils.o $(FFLIBS) $(EXTRALIBS)
+
+ffmpeg$(EXESUF): ffmpeg_g$(EXESUF)
+	cp -p $< $@
+	$(STRIP) $@
+
+ffserver$(EXESUF): ffserver.o .libs
+	$(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)
+
+ffplay$(EXESUF): ffplay_g$(EXESUF)
+	cp -p $< $@
+	$(STRIP) $@
+
+output_example$(EXESUF): output_example.o .libs
+	$(CC) $(LDFLAGS) -o $@ output_example.o $(FFLIBS) $(EXTRALIBS)
+
+qt-faststart$(EXESUF): qt-faststart.c
+	$(CC) $(SRC_PATH)/qt-faststart.c -o qt-faststart$(EXESUF)
+
+cws2fws$(EXESUF): cws2fws.c
+	$(CC) $(SRC_PATH)/cws2fws.c -o cws2fws$(EXESUF) -lz
+
+ffplay.o: ffplay.c
+	$(CC) $(CFLAGS) $(SDL_CFLAGS) -c -o $@ $< 
+
+%.o: %.c
+	$(CC) $(CFLAGS) -c -o $@ $< 
+
+videohook: .libs
+	$(MAKE) -C vhook all
+
+documentation:
+	$(MAKE) -C doc all
+
+.PHONY: install
+
+install: all install-man $(INSTALLVHOOK)
+	$(MAKE) -C libavcodec install
+	$(MAKE) -C libavformat install
+	install -d "$(bindir)"
+	install -c $(INSTALLSTRIP) -m 755 $(PROG) "$(bindir)"
+
+# create the window installer
+wininstaller: all install
+	makensis ffinstall.nsi
+
+# install man from source dir if available
+install-man:
+ifneq ($(CONFIG_WIN32),yes)
+	if [ -f doc/ffmpeg.1 ] ; then \
+	    install -d "$(mandir)/man1" ; \
+	    install -m 644 $(MANPAGE) "$(mandir)/man1" ; \
+	fi
+endif
+
+install-vhook:
+	$(MAKE) -C vhook install
+
+installlib:
+	$(MAKE) -C libavcodec installlib
+	$(MAKE) -C libavformat installlib
+
+dep:	depend
+
+depend: .depend
+	make -C libavcodec depend
+	make -C libavformat depend
+ifeq ($(BUILD_VHOOK),yes)
+	make -C vhook depend
+endif
+
+.depend: $(SRCS)
+	$(CC) -MM $(CFLAGS) $(SDL_CFLAGS) $^ 1>.depend
+
+.libs: lib
+	@test -f .libs || touch .libs
+	@for i in $(DEP_LIBS) ; do if $(TEST) $$i -nt .libs ; then touch .libs; fi ; done
+
+clean: $(CLEANVHOOK)
+	$(MAKE) -C libavcodec clean
+	$(MAKE) -C libavformat clean
+	$(MAKE) -C tests clean
+	rm -f *.o *.d *~ .libs .depend gmon.out TAGS ffmpeg_g$(EXESUF) \
+	   ffplay_g$(EXESUF) $(PROG) $(PROGTEST) $(QTFASTSTART)
+
+clean-vhook:
+	$(MAKE) -C vhook clean
+
+# Note well: config.log is NOT removed.
+distclean: clean
+	$(MAKE) -C libavcodec distclean
+	rm -f config.mak config.h
+
+TAGS:
+	etags *.[ch] libavformat/*.[ch] libavcodec/*.[ch]
+
+# regression tests
+
+libavtest test mpeg4 mpeg test-server fulltest: ffmpeg$(EXESUF)
+	$(MAKE) -C tests $@
+
+# tar release (use 'make -k tar' on a checkouted tree)
+FILE=ffmpeg-$(shell grep "\#define FFMPEG_VERSION " libavcodec/avcodec.h | \
+                    cut -d "\"" -f 2 )
+
+tar:
+	rm -rf /tmp/$(FILE)
+	cp -r . /tmp/$(FILE)
+	( cd /tmp ; tar zcvf ~/$(FILE).tar.gz $(FILE) --exclude CVS )
+	rm -rf /tmp/$(FILE)
+
+.PHONY: lib
+
+ifneq ($(wildcard .depend),)
+include .depend
+endif
--- ffmpeg-0.4.9-p20050226-orig/Makefile.rej	1969-12-31 19:00:00.000000000 -0500
+++ ffmpeg-0.4.9-p20050226-orig/Makefile.rej	2005-03-18 17:48:12.000000000 -0500
@@ -0,0 +1,17 @@ 
+***************
+*** 75,80 ****
+  ifneq ($(CONFIG_A52BIN),yes)
+  OBJS+= liba52/bit_allocate.o liba52/bitstream.o liba52/downmix.o \
+  	liba52/imdct.o  liba52/parse.o liba52/crc.o liba52/resample.o
+  endif
+  endif
+  
+--- 75,82 ----
+  ifneq ($(CONFIG_A52BIN),yes)
+  OBJS+= liba52/bit_allocate.o liba52/bitstream.o liba52/downmix.o \
+  	liba52/imdct.o  liba52/parse.o liba52/crc.o liba52/resample.o
++ else
++ EXTRALIBS += -la52
+  endif
+  endif
+  
--- ffmpeg-0.4.9-p20050226-orig/libavcodec/Makefile	2005-02-25 22:40:29.000000000 -0500
+++ ffmpeg-0.4.9-p20050226-orig/libavcodec/Makefile	2005-03-18 17:48:17.000000000 -0500
@@ -75,6 +75,8 @@ 
 ifneq ($(CONFIG_A52BIN),yes)
 OBJS+= liba52/bit_allocate.o liba52/bitstream.o liba52/downmix.o \
 	liba52/imdct.o  liba52/parse.o liba52/crc.o liba52/resample.o
+else
+EXTRALIBS += -la52
 endif
 endif
 
--- ffmpeg-0.4.9-p20050226-orig/libavcodec/a52dec.c	2004-05-21 10:37:16.000000000 -0400
+++ ffmpeg-0.4.9-p20050226-orig/libavcodec/a52dec.c	2005-03-18 17:48:17.000000000 -0500
@@ -73,7 +73,7 @@ 
 {
     void* f = dlsym(handle, symbol);
     if (!f)
-	fprintf(stderr, "A52 Decoder - function '%s' can't be resolved\n", symbol);
+	av_log(stderr, "A52 Decoder - function '%s' can't be resolved\n", symbol);
     return f;
 }
 #endif
@@ -86,7 +86,7 @@ 
     s->handle = dlopen(liba52name, RTLD_LAZY);
     if (!s->handle)
     {
-	fprintf(stderr, "A52 library %s could not be opened! \n%s\n", liba52name, dlerror());
+	av_log(stderr, "A52 library %s could not be opened! \n%s\n", liba52name, dlerror());
         return -1;
     }
     s->a52_init = (a52_state_t* (*)(uint32_t)) dlsymm(s->handle, "a52_init");