--- 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>
 }
--- opencv-1.0.0/otherlibs/highgui/cvcap_ffmpeg.cpp.orig	2008-06-28 10:14:35.000000000 +0300
+++ opencv-1.0.0/otherlibs/highgui/cvcap_ffmpeg.cpp	2008-06-28 10:24:45.000000000 +0300
@@ -105,7 +105,8 @@
 
 static int icvOpenAVI_FFMPEG( CvCaptureAVI_FFMPEG* capture, const char* filename )
 {
-    int err, valid = 0, video_index = -1, i;
+    unsigned int i;
+    int err, valid = 0, video_index = -1;
     AVFormatContext *ic;
 
     capture->ic = NULL;
@@ -753,7 +754,7 @@
 /// close video output stream and free associated memory
 CV_IMPL void cvReleaseVideoWriter( CvVideoWriter ** writer )
 {
-	int i;
+	unsigned int i;
 
 	// nothing to do if already released
 	if ( !(*writer) )
@@ -801,7 +802,7 @@
 
 	if (!(mywriter->fmt->flags & AVFMT_NOFILE)) {
 		/* close the output file */
-		url_fclose(&mywriter->oc->pb);
+		url_fclose(mywriter->oc->pb);
 	}
 
 	/* free the stream */
--- opencv-1.0.0/otherlibs/highgui/cvcap_xine.cpp.orig	2006-05-04 18:55:20.000000000 +0300
+++ opencv-1.0.0/otherlibs/highgui/cvcap_xine.cpp	2008-06-28 10:19:47.000000000 +0300
@@ -598,7 +598,7 @@
 	// TODO: FIX IT, DOESN'T WORK PROPERLY, YET...!
 		int pos_t, pos_l, length;
 		xine_get_pos_length( capture->stream, &pos_l, &pos_t, &length );
-		fprintf( stderr, "ratio on GetProperty(): %n\n", pos_l );
+		fprintf( stderr, "ratio on GetProperty(): %d\n", pos_l );
 
 		/// use xinelib's seek functionality
 		if ( xine_play( capture->stream, (int)(ratio*(float)length), 0 ) )