updated ffmpeg to 0.6.0

2010-08-05 17:24:41 +00:00
parent d8ad4e2267
commit 26c6b955a8
54 changed files with 2580 additions and 1339 deletions
--- a/modules/highgui/src/cap_ffmpeg.cpp
+++ b/modules/highgui/src/cap_ffmpeg.cpp
@@ -60,9 +60,10 @@ extern "C" {
 #endif

 #ifdef WIN32
-  #include <ffmpeg_/avformat.h>
-  #include <ffmpeg_/avcodec.h>
-  #include <ffmpeg_/imgconvert.h>
+  #define HAVE_FFMPEG_SWSCALE 1
+  #include <libavformat/avformat.h>
+  #include <libavcodec/avcodec.h>
+  #include <libswscale/swscale.h>
 #else

 // if the header path is not specified explicitly, let's deduce it