diff --git a/mpeg4ip/configure.in b/mpeg4ip/configure.in

index a1e065d..92b0140 100644

--- a/mpeg4ip/configure.in

+++ b/mpeg4ip/configure.in

@@ -415,10 +415,11 @@ if test x$enable_mp4live = xyes; then

 	              [have_mp4live=false],

 		        [#include <sys/time.h>

 #include <sys/types.h>

-#include <linux/videodev.h>])

+#include <libv4l1-videodev.h>

+#include <linux/videodev2.h>])

 	if test x$have_mp4live = xfalse; then

 	    KERNEL_VERSION=`uname -r`

-	    AC_CHECK_FILE(/lib/modules/$KERNEL_VERSION/build/include/linux/videodev2.h,

+	    AC_CHECK_FILE(/usr/include/linux/videodev2.h,

 	                  [AC_MSG_WARN([])

 			   AC_MSG_WARN([])

 			  AC_MSG_WARN([We cannot locate videodev2.h in /usr/include/linux])

@@ -471,8 +472,8 @@ AC_ARG_ENABLE(ffmpeg,

 if test x$disable_ffmpeg = xfalse; then

   if test x$have_ffmpeg_arg = xtrue; then

      AC_MSG_NOTICE([have enable ffmpeg $enable_ffmpeg])

-     FFMPEG_INC=-I${enable_ffmpeg}/libavcodec

-     FFMPEG_LIB="${enable_ffmpeg}/libavcodec/libavcodec.a -lz"

+     FFMPEG_INC=-I${enable_ffmpeg}/include/libavcodec

+     FFMPEG_LIB="-lavcodec -lz"

      saveCFLAGS="$CFLAGS"

      CFLAGS="$CFLAGS $FFMPEG_INC"

      AC_CHECK_TYPES([AVRational], , , [#include <avcodec.h>])

@@ -497,8 +498,8 @@ if test x$disable_ffmpeg = xfalse; then

         AC_DEFINE(HAVE_FFMPEG_INSTALLED, 1, [defined if ffmpeg is installed])

         FFMPEG_INC=

         FFMPEG_LIB="-lavcodec -lswscale -lz $ffmpeg_add_libs"

-        AC_CHECK_TYPES([AVRational], , , [#include <ffmpeg/avcodec.h>])

-	AC_CHECK_MEMBERS(AVCodecContext.time_base, , , [#include <ffmpeg/avcodec.h>])

+        AC_CHECK_TYPES([AVRational], , , [#include <libavcodec/avcodec.h>])

+	AC_CHECK_MEMBERS(AVCodecContext.time_base, , , [#include <libavcodec/avcodec.h>])

         AC_DEFINE(HAVE_FFMPEG, 1, [enable ffmpeg for mp4live])

      fi

   fi