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/ffmpeg/ffopencv.cpp
+++ b/modules/ffmpeg/ffopencv.cpp
@@ -541,6 +541,7 @@ extern "C" { __declspec(dllexport) unsigned int __lc_codepage = 0; }
 #pragma comment(lib, "libavformat.a")
 #pragma comment(lib, "libavcodec.a")
 #pragma comment(lib, "libavutil.a")
+#pragma comment(lib, "libswscale.a")
 #endif
 #pragma comment(lib, "libwsock32_.a")