diff -urN opencv-1.0.0.orig/otherlibs/highgui/cvcap_ffmpeg.cpp opencv-1.0.0/otherlibs/highgui/cvcap_ffmpeg.cpp --- opencv-1.0.0.orig/otherlibs/highgui/cvcap_ffmpeg.cpp 2006-07-25 01:27:39 +0300 +++ opencv-1.0.0/otherlibs/highgui/cvcap_ffmpeg.cpp 2008-03-16 02:28:05 +0200 @@ -42,6 +42,7 @@ #include "_highgui.h" +#define __STDC_CONSTANT_MACROS extern "C" { #include } @@ -233,7 +234,6 @@ static int icvSetPropertyAVI_FFMPEG( CvCaptureAVI_FFMPEG* capture, int property_id, double value ); - static double icvGetPropertyAVI_FFMPEG( CvCaptureAVI_FFMPEG* capture, int property_id ) { if( !capture || !capture->video_st || !capture->picture->data[0] ) @@ -781,7 +781,11 @@ if (!(mywriter->fmt->flags & AVFMT_NOFILE)) { /* close the output file */ +#if LIBAVFORMAT_BUILD > 4628 + url_fclose(mywriter->oc->pb); +#else url_fclose(&mywriter->oc->pb); +#endif } /* free the stream */