--- MPlayer-0.90pre5/configure.bero	Thu Sep 19 14:48:16 2002
+++ MPlayer-0.90pre5/configure	Thu Sep 19 14:50:46 2002
@@ -3284,6 +3284,9 @@
     else
       echores "no (old ffmpeg version, use CVS !)"
     fi
+  elif test -e /usr/lib/libavcodec.a; then
+    _libavcodec=yes
+    echores "yes (system-wide static library)"
   else
     echores "no (see DOCS/codecs.html)"
   fi
@@ -3305,6 +3308,9 @@
   if cc_check -lffmpeg -lm ; then
     _libavcodecso=yes
     echores "yes (using libffmpeg.so)"
+  elif cc_check -lavcodec -lm ; then
+    _libavcodecso=yes
+    echores "yes (using libavcodec.so)"
   else
     echores "no (libffmpeg.so is broken/obsolete)"
   fi
--- MPlayer-0.90pre5/Makefile.bero	Thu Sep 19 14:54:04 2002
+++ MPlayer-0.90pre5/Makefile	Thu Sep 19 14:54:14 2002
@@ -57,7 +57,7 @@
 endif
 CFLAGS = $(OPTFLAGS) -Ilibmpdemux -Iloader $(VO_INC) $(EXTRA_INC) # -Wall
 
-PARTS = libfame libmpdemux libmpcodecs mp3lib liba52 libmp1e libmpeg2 libavcodec libao2 drivers drivers/syncfb linux postproc input libmpdvdkit
+PARTS = libfame libmpdemux libmpcodecs mp3lib liba52 libmp1e libmpeg2 libao2 drivers drivers/syncfb linux postproc input libmpdvdkit
 ifeq ($(VIDIX),yes)
 PARTS += libdha vidix
 endif
@@ -145,9 +145,6 @@
 libmp1e/libmp1e.a:
 	$(MAKE) -C libmp1e
 
-libavcodec/libavcodec.a:
-	$(MAKE) -C libavcodec
-
 libmpeg2/libmpeg2.a:
 	$(MAKE) -C libmpeg2
 
--- MPlayer-0.90pre5/libmpcodecs/ad_ffmpeg.c.bero	Thu Sep 19 15:29:00 2002
+++ MPlayer-0.90pre5/libmpcodecs/ad_ffmpeg.c	Thu Sep 19 15:31:47 2002
@@ -27,9 +27,9 @@
 #define assert(x)
 
 #ifdef USE_LIBAVCODEC_SO
-#include <libffmpeg/avcodec.h>
+#include <ffmpeg/avcodec.h>
 #else
-#include "libavcodec/avcodec.h"
+#include "ffmpeg/avcodec.h"
 #endif
 
 extern int avcodec_inited;
--- MPlayer-0.90pre5/libmpcodecs/vd_ffmpeg.c.bero	Thu Sep 19 15:29:03 2002
+++ MPlayer-0.90pre5/libmpcodecs/vd_ffmpeg.c	Thu Sep 19 15:31:51 2002
@@ -27,9 +27,9 @@
 
 
 #ifdef USE_LIBAVCODEC_SO
-#include <libffmpeg/avcodec.h>
+#include <ffmpeg/avcodec.h>
 #else
-#include "libavcodec/avcodec.h"
+#include "ffmpeg/avcodec.h"
 #endif
 
 int avcodec_inited=0;
--- MPlayer-0.90pre5/libmpcodecs/ve_lavc.c.bero	Thu Sep 19 15:29:06 2002
+++ MPlayer-0.90pre5/libmpcodecs/ve_lavc.c	Thu Sep 19 15:31:56 2002
@@ -28,9 +28,9 @@
 //===========================================================================//
 
 #ifdef USE_LIBAVCODEC_SO
-#include <libffmpeg/avcodec.h>
+#include <ffmpeg/avcodec.h>
 #else
-#include "libavcodec/avcodec.h"
+#include "ffmpeg/avcodec.h"
 #endif
 
 #if LIBAVCODEC_BUILD < 4601
--- MPlayer-0.90pre5/libmpcodecs/vf_lavc.c.bero	Thu Sep 19 15:29:08 2002
+++ MPlayer-0.90pre5/libmpcodecs/vf_lavc.c	Thu Sep 19 15:32:02 2002
@@ -16,9 +16,9 @@
 //#include "../libvo/fastmemcpy.h"
 
 #ifdef USE_LIBAVCODEC_SO
-#include <libffmpeg/avcodec.h>
+#include <ffmpeg/avcodec.h>
 #else
-#include "libavcodec/avcodec.h"
+#include "ffmpeg/avcodec.h"
 #endif
 
 extern int avcodec_inited;
--- MPlayer-0.90pre5/libvo/vo_dxr3.c.bero	Thu Sep 19 15:29:15 2002
+++ MPlayer-0.90pre5/libvo/vo_dxr3.c	Thu Sep 19 15:32:59 2002
@@ -110,11 +110,11 @@
 /* libavcodec codec initialisation */
 #ifdef USE_LIBAVCODEC
 #ifdef USE_LIBAVCODEC_SO
-#include <libffmpeg/avcodec.h>
-#include <libffmpeg/dsputil.h>
+#include <ffmpeg/avcodec.h>
+#include <ffmpeg/dsputil.h>
 #else
-#include "libavcodec/avcodec.h"
-#include "libavcodec/dsputil.h"
+#include <ffmpeg/avcodec.h>
+#include <ffmpeg/dsputil.h>
 #endif
 /* for video encoder */
 static AVCodec *avc_codec = NULL;
--- MPlayer-0.90pre5/libvo/jpeg_enc.c.bero	Thu Sep 19 15:32:02 2002
+++ MPlayer-0.90pre5/libvo/jpeg_enc.c	Thu Sep 19 15:32:34 2002
@@ -35,9 +35,9 @@
 /* We need this #define because we need ../libavcodec/common.h to #define 
  * be2me_32, otherwise the linker will complain that it doesn't exist */
 #define HAVE_AV_CONFIG_H
-#include "../libavcodec/avcodec.h"
-#include "../libavcodec/dsputil.h"
-#include "../libavcodec/mpegvideo.h"
+#include <ffmpeg/avcodec.h>
+#include <ffmpeg/dsputil.h>
+#include <ffmpeg/mpegvideo.h>
 
 #include "jpeg_enc.h"
 
--- MPlayer-0.90pre5/configure.bero	Thu Sep 19 15:28:49 2002
+++ MPlayer-0.90pre5/configure	Thu Sep 19 15:31:27 2002
@@ -3301,7 +3301,7 @@
 # FIXME : check for avcodec_find_encoder_by_name() for mencoder
   cat > $TMPC << EOF
 #define FF_POSTPROCESS 1 
-#include <libffmpeg/avcodec.h>
+#include <ffmpeg/avcodec.h>
 int quant_store[MBR+1][MBC+1];
 int main(void) { return 0; }
 EOF
@@ -3325,7 +3325,7 @@
 if test "$_libavcodec" = yes ; then
   _def_libavcodec='#define USE_LIBAVCODEC 1'
   _ld_libavcodec='-Llibavcodec -lavcodec'
-  _dep_libavcodec='libavcodec/libavcodec.a'
+  _dep_libavcodec=''
   _def_ffpostprocess='#define FF_POSTPROCESS 1'
   _codecmodules="libavcodec $_codecmodules"
 elif test "$_libavcodecso" = yes ; then