Fixed compiling error under Ubuntu with ffmpeg 0.7.x and advised under Windows

36b2ff3c · Alexander Reshetnikov · ddc4ed47 · 36b2ff3c · 36b2ff3c
Commit 36b2ff3c authored Mar 15, 2012 by Alexander Reshetnikov
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

CMakeLists.txt CMakeLists.txt +1 -1

cap_ffmpeg_impl_v2.hpp modules/highgui/src/cap_ffmpeg_impl_v2.hpp +0 -0

No files found.
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -395,7 +395,7 @@ if(UNIX)
    endif()

    if(HAVE_FFMPEG)
-    CHECK_MODULE(libavformat>=53 NEW_FFMPEG)
+    CHECK_MODULE(libavformat>=52.111.0 NEW_FFMPEG)
    endif()

    if(WITH_1394)

--- a/modules/highgui/src/cap_ffmpeg_impl_v2.hpp
+++ b/modules/highgui/src/cap_ffmpeg_impl_v2.hpp