diff -Nur avifile.orig/Makefile.am avifile/Makefile.am
--- avifile.orig/Makefile.am	2004-10-01 06:18:18.000000000 -0700
+++ avifile/Makefile.am	2005-04-14 14:23:27.000000000 -0700
@@ -1,4 +1,4 @@
-SUBDIRS = . admin m4 ffmpeg drivers lib plugins bin \
+SUBDIRS = . admin m4 drivers lib plugins bin \
  doc include debian libavqt player samples
 
 EXTRA_DIST = INSTALL autogen.sh avifile.spec.in avifile.pc.in \
diff -Nur avifile.orig/configure.in avifile/configure.in
--- avifile.orig/configure.in	2005-02-24 04:19:50.000000000 -0800
+++ avifile/configure.in	2005-04-14 13:48:50.000000000 -0700
@@ -1008,19 +1008,6 @@
 AC_OUTPUT(
  Makefile
  admin/Makefile
- ffmpeg/Makefile
- ffmpeg/libavformat/Makefile
- ffmpeg/libavcodec/Makefile
- ffmpeg/libavcodec/alpha/Makefile
- ffmpeg/libavcodec/armv4l/Makefile
- ffmpeg/libavcodec/i386/Makefile
- ffmpeg/libavcodec/liba52/Makefile
- ffmpeg/libavcodec/libpostproc/Makefile
- ffmpeg/libavcodec/mlib/Makefile
- ffmpeg/libavcodec/ppc/Makefile
- ffmpeg/libavcodec/ps2/Makefile
- ffmpeg/libavcodec/sh4/Makefile
- ffmpeg/libavcodec/sparc/Makefile
  drivers/Makefile
  drivers/libdha/Makefile
  drivers/libdha/bin/Makefile
diff -Nur avifile.orig/debian/changelog avifile/debian/changelog
--- avifile.orig/debian/changelog	2005-02-25 02:50:54.000000000 -0800
+++ avifile/debian/changelog	2005-04-14 10:29:08.000000000 -0700
@@ -1,10 +1,10 @@
-avifile (1:0.7.44.20050----1) unstable; urgency=low
+avifile (1:0.7.44.20050414-1) unstable; urgency=low
   * thread were already fixed long time ago - just forget to close
     this bug (Closes: 223101)
   * some thing applies to this error (Closes: 220056) - no undefined 
     symbols are shown to me...
 
- -- Zdenek Kabelac <kabi@debian.org>  Thu, -- --- 2005 10:49:49 +0100
+ -- Zdenek Kabelac <kabi@debian.org>  Thu, 14 Apr 2005 10:49:49 +0100
 
 avifile (1:0.7.43.20050224-1) unstable; urgency=low
   * updated to latest ffmpeg
diff -Nur avifile.orig/debian/control avifile/debian/control
--- avifile.orig/debian/control	2005-02-25 02:51:43.000000000 -0800
+++ avifile/debian/control	2005-04-14 14:46:25.000000000 -0700
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Zdenek Kabelac <kabi@debian.org>
 Standards-Version: 3.5.8
-Build-Depends: debhelper (>= 2.0), libqt3-mt-dev (>= 3:3.1.1-2), libsdl1.2-dev | libsdl1.1-dev | libsdl1.0-dev , libaudiofile-dev, libjpeg62-dev, libvorbis-dev, libogg-dev, libmad0-dev, libxft-dev, autoconf (>= 2.13-1), automake (>= 1.4-1) | automake1.7 | automake1.8 | automake1.4 , libtool, gettext, patch, netpbm | pnmtopng
+Build-Depends: debhelper (>= 2.0), libqt3-mt-dev (>= 3:3.1.1-2), libsdl1.2-dev | libsdl1.1-dev | libsdl1.0-dev , libaudiofile-dev, libjpeg62-dev, libvorbis-dev, libogg-dev, libmad0-dev, libxft-dev, libavcodec-dev, libavformat-dev, autoconf (>= 2.13-1), automake (>= 1.4-1) | automake1.7 | automake1.8 | automake1.4 , libtool, gettext, patch, netpbm | pnmtopng
 
 Package: libavifile-0.7c102
 Architecture: any
diff -Nur avifile.orig/debian/rules avifile/debian/rules
--- avifile.orig/debian/rules	2005-02-24 05:11:41.000000000 -0800
+++ avifile/debian/rules	2005-04-14 20:51:32.000000000 -0700
@@ -177,7 +177,7 @@
 
 binary-indep:
 # There are no architecture-independent files to be uploaded
-# generated by this package.  If there were any they would be
+# generated by this package. If there were any they would be
 # made here.
 
 binary-arch: cleanB build install
@@ -216,16 +216,16 @@
 #	fi
 
 # trick to allow build empty packages
-# avoid problem with  trailing ','
+# avoid problem with trailing ','
 	@for i in $(allplugins) ; do if test ! -e debian/$$i.substvars ; then \
 		echo "shlibs:Depends=libavifile-0.7c102 (>= 1:0.7.43.20050224-1), libc6" > debian/$$i.substvars ; \
 	fi ; done
 
 	dh_shlibdeps -Xxvid4 -Xdivx4 -ldebian/$(libraries)/usr/lib:debian/$(player)/usr/lib
 
-	dh_gencontrol
+	dh_gencontrol -s
 	dh_md5sums
-	dh_builddeb -v
+	dh_builddeb -v -s
 
 checkscripts:
 	@echo ":: Checking scripts"
diff -Nur avifile.orig/lib/aviread/Makefile.am avifile/lib/aviread/Makefile.am
--- avifile.orig/lib/aviread/Makefile.am	2003-03-11 03:17:37.000000000 -0800
+++ avifile/lib/aviread/Makefile.am	2005-04-14 15:18:33.000000000 -0700
@@ -43,17 +43,7 @@
  StreamInfo.cpp
 
 
-if AMM_LINK_SHARED
-FF_LIB = \
- ../../ffmpeg/libavformat/libaviplayavformat.la \
- ../../ffmpeg/libavcodec/libaviplayavcodec.la
-else 
-FF_LIB = \
- ../../ffmpeg/libavformat/libavformat.la \
- ../../ffmpeg/libavcodec/libavcodec.la
-endif
-
-libaviread_la_LIBADD = $(FF_LIB)
+libaviread_la_LDFLAGS = `ffmpeg-config --libs avcodec avformat`
 
 AM_CPPFLAGS = $(LTNOPIC) \
  -I$(srcdir)/../common \