--- qemacs-0.3.1/configure	2005-02-21 09:49:52.000000000 +0000
+++ qemacs-0.3.1/configure	2005-02-21 09:49:52.000000000 +0000
@@ -139,9 +139,7 @@ for opt do
   ;;
   --disable-plugins) plugins="no"
   ;;
-  --with-ffmpegdir=*)  ffmpeg_srcdir=${opt#--with-ffmpegdir=} ; ffmpeg="yes"
-  ;;
-  --with-ffmpeglibdir=*)  ffmpeg_libdir=${opt#--with-ffmpeglibdir=}
+  --enable-ffmpeg) ffmpeg="yes"
   ;;
   esac
 done
@@ -190,12 +188,6 @@ EOF
 $cc -o $TMPO $TMPC 2> /dev/null || _memalign=no
 fi
 
-if test "$ffmpeg" = "yes" ; then
-    if test -z "$ffmpeg_libdir" ; then
-        ffmpeg_libdir="$ffmpeg_srcdir"
-    fi
-fi
-
 if test "$tiny" = "yes" ; then
     x11="no"
     ffmpeg="no"
@@ -240,15 +232,13 @@ echo "  --enable-tiny            build a
 echo "  --disable-html           disable graphical html support"
 echo "  --disable-png            disable png support"
 echo "  --disable-plugins        disable plugins support"
-echo "  --with-ffmpegdir=DIR     find ffmpeg sources and libraries in DIR"
-echo "                           for audio/video/image support"
+echo "  --enable-ffmpegdir       enable-ffmpeg support"
 echo ""
 echo "Advanced options (experts only):"
 echo "  --source-path=PATH       path of source code [$source_path]"
 echo "  --cross-prefix=PREFIX    use PREFIX for compile tools [$cross_prefix]"
 echo "  --cc=CC                  use C compiler CC [$cc]"
 echo "  --make=MAKE              use specified make [$make]"
-echo "  --with-ffmpeglibdir=DIR  set ffmpeg object files directory"
 echo ""
 echo "NOTE: The object files are build at the place where configure is launched"
 exit 1
@@ -361,8 +351,6 @@ fi
 if test "$ffmpeg" = "yes" ; then
   echo "#define CONFIG_FFMPEG 1" >> $TMPH
   echo "CONFIG_FFMPEG=yes" >> config.mak
-  echo "FFMPEG_SRCDIR=$ffmpeg_srcdir" >> config.mak
-  echo "FFMPEG_LIBDIR=$ffmpeg_libdir" >> config.mak
 fi
 
 # build tree in object directory if source path is different from current one
--- qemacs-0.3.1/Makefile	2005-02-21 09:57:19.000000000 +0000
+++ qemacs-0.3.1/Makefile	2005-02-21 09:57:19.000000000 +0000
@@ -128,10 +128,7 @@ endif
 
 ifdef CONFIG_FFMPEG
 OBJS+= video.o image.o
-DEP_LIBS+=$(FFMPEG_LIBDIR)/libavcodec/libavcodec.a $(FFMPEG_LIBDIR)/libavformat/libavformat.a
-LIBS+=  -L$(FFMPEG_LIBDIR)/libavcodec -L$(FFMPEG_LIBDIR)/libavformat -lavformat -lavcodec -lz -lpthread
-DEFINES+= -I$(FFMPEG_SRCDIR)/libavcodec -I$(FFMPEG_SRCDIR)/libavformat
-TARGETS+=ffplay
+LIBS+=  -lavformat -lavcodec -lz -lpthread
 endif
 
 # must be the last object
--- qemacs-0.3.1/video.c	2005-02-21 09:57:28.000000000 +0000
+++ qemacs-0.3.1/video.c	2005-02-21 09:57:28.000000000 +0000
@@ -17,7 +17,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 #include "qe.h"
-#include "avformat.h"
+#include "ffmpeg/avformat.h"
 #include <pthread.h>
 #include <math.h>
 
--- qemacs-0.3.1/image.c	2005-02-21 09:57:52.000000000 +0000
+++ qemacs-0.3.1/image.c	2005-02-21 09:57:52.000000000 +0000
@@ -17,7 +17,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 #include "qe.h"
-#include "avformat.h"
+#include "ffmpeg/avformat.h"
 
 typedef struct ImageBuffer {
     int pix_fmt;