--- opencv-1.0.0/configure.in.orig	2008-06-28 09:58:49.000000000 +0300
+++ opencv-1.0.0/configure.in	2008-06-28 10:10:23.000000000 +0300
@@ -439,8 +439,8 @@
 AM_CONDITIONAL([BUILD_XINE], [test x"$have_xine" = "xyes"])
 
 if test x"$with_ffmpeg" = x"yes"; then
-        AC_CHECK_HEADER(ffmpeg/avcodec.h,, [AC_MSG_ERROR([FFmpeg requested but header file ffmpeg/avcodec.h not found])])
-        AC_CHECK_HEADER(ffmpeg/swscale.h,, [AC_MSG_ERROR([FFmpeg requested but header file ffmpeg/swscale.h not found])])
+        AC_CHECK_HEADER(libavcodec/avcodec.h,, [AC_MSG_ERROR([FFmpeg requested but header file ffmpeg/avcodec.h not found])])
+        AC_CHECK_HEADER(libswscale/swscale.h,, [AC_MSG_ERROR([FFmpeg requested but header file ffmpeg/swscale.h not found])])
         AC_CHECK_LIB(avcodec, avcodec_decode_video,, [AC_MSG_ERROR([FFmpeg requested but ffmpeg libraries not found])])
         AC_CHECK_LIB(avformat, av_open_input_file,, [AC_MSG_ERROR([FFmpeg requested but ffmpeg libraries not found])])
         AC_CHECK_LIB(swscale, sws_getContext,, [AC_MSG_ERROR([FFmpeg requested but ffmpeg libraries not found])])
--- opencv-1.0.0/otherlibs/highgui/cvcap_ffmpeg.cpp.orig	2008-06-28 09:58:50.000000000 +0300
+++ opencv-1.0.0/otherlibs/highgui/cvcap_ffmpeg.cpp	2008-06-28 10:11:16.000000000 +0300
@@ -44,9 +44,9 @@
 #define __STDC_CONSTANT_MACROS
 
 extern "C" {
-#include <ffmpeg/avformat.h>
-#include <ffmpeg/avcodec.h>
-#include <ffmpeg/swscale.h>
+#include <libavformat/avformat.h>
+#include <libavcodec/avcodec.h>
+#include <libswscale/swscale.h>
 #include <sys/types.h> /* size_t */
 #include <sys/errno.h>
 }