diff --git a/configure b/configure
index 823daaff2e..2afceab9b1 100755
--- a/configure
+++ b/configure
@@ -903,7 +903,7 @@ _prefix="/usr/local"
 # and have - unless stated otherwise - at least 2 states : yes no
 # If autodetection is available then the third state is: auto
 _libavcodec=auto
-_libavcodecso=no # changed default to no as it causes problems - atmos
+_libavcodecso=auto 
 _fame=auto
 _mp1e=no
 _mencoder=yes
@@ -3516,15 +3516,18 @@ if test "$_libavcodecso" = auto ; then
 # 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; }
+int main(void) { 
+    avcodec_find_encoder_by_name("");
+    return 0; 
+}
 EOF
-  if cc_check -lffmpeg -lm ; then
+  if cc_check -lavcodec -lm ; then
     _libavcodecso=yes
-    echores "yes (using libffmpeg.so)"
+    echores "yes (using libavcodec.so)"
   else
-    echores "no (libffmpeg.so is broken/obsolete)"
+    echores "no (libavcodec.so is broken/obsolete)"
   fi
 else
   echores "$_libavcodecso"
@@ -3541,8 +3544,9 @@ if test "$_libavcodec" = yes ; then
   _def_ffpostprocess='#define FF_POSTPROCESS 1'
   _codecmodules="libavcodec $_codecmodules"
 elif test "$_libavcodecso" = yes ; then
+  _def_libavcodec='#define USE_LIBAVCODEC 1'
   _def_libavcodecso='#define USE_LIBAVCODEC_SO 1'
-  _ld_libavcodec='-lffmpeg'
+  _ld_libavcodec='-lavcodec'
   _def_ffpostprocess='#define FF_POSTPROCESS 1'
   _codecmodules="libavcodec.so $_codecmodules"
 else
diff --git a/libmpcodecs/ad_ffmpeg.c b/libmpcodecs/ad_ffmpeg.c
index 6e257f212b..fa642a6a95 100644
--- a/libmpcodecs/ad_ffmpeg.c
+++ b/libmpcodecs/ad_ffmpeg.c
@@ -27,7 +27,7 @@ LIBAD_EXTERN(ffmpeg)
 #define assert(x)
 
 #ifdef USE_LIBAVCODEC_SO
-#include <libffmpeg/avcodec.h>
+#include <ffmpeg/avcodec.h>
 #else
 #include "libavcodec/avcodec.h"
 #endif
diff --git a/libmpcodecs/vd_ffmpeg.c b/libmpcodecs/vd_ffmpeg.c
index 4efed49144..a0ab8779f0 100644
--- a/libmpcodecs/vd_ffmpeg.c
+++ b/libmpcodecs/vd_ffmpeg.c
@@ -28,7 +28,7 @@ LIBVD_EXTERN(ffmpeg)
 
 
 #ifdef USE_LIBAVCODEC_SO
-#include <libffmpeg/avcodec.h>
+#include <ffmpeg/avcodec.h>
 #else
 #include "libavcodec/avcodec.h"
 #endif
diff --git a/libmpcodecs/ve_lavc.c b/libmpcodecs/ve_lavc.c
index 363dc69663..0d6f7c92f4 100644
--- a/libmpcodecs/ve_lavc.c
+++ b/libmpcodecs/ve_lavc.c
@@ -30,7 +30,7 @@ extern int pass;
 //===========================================================================//
 
 #ifdef USE_LIBAVCODEC_SO
-#include <libffmpeg/avcodec.h>
+#include <ffmpeg/avcodec.h>
 #else
 #include "libavcodec/avcodec.h"
 #endif
diff --git a/libmpcodecs/vf_lavc.c b/libmpcodecs/vf_lavc.c
index 73fdc47153..d5cb90060a 100644
--- a/libmpcodecs/vf_lavc.c
+++ b/libmpcodecs/vf_lavc.c
@@ -16,7 +16,7 @@
 //#include "../libvo/fastmemcpy.h"
 
 #ifdef USE_LIBAVCODEC_SO
-#include <libffmpeg/avcodec.h>
+#include <ffmpeg/avcodec.h>
 #else
 #include "libavcodec/avcodec.h"
 #endif
diff --git a/libmpcodecs/vf_lavcdeint.c b/libmpcodecs/vf_lavcdeint.c
index 179f3b0c7f..8c64341ba2 100644
--- a/libmpcodecs/vf_lavcdeint.c
+++ b/libmpcodecs/vf_lavcdeint.c
@@ -16,7 +16,7 @@
 //#include "../libvo/fastmemcpy.h"
 
 #ifdef USE_LIBAVCODEC_SO
-#include <libffmpeg/avcodec.h>
+#include <ffmpeg/avcodec.h>
 #else
 #include "libavcodec/avcodec.h"
 #endif