From 6b0ea0e04e267fb9d2f1c712f2a2e2dc7be6d5ee Mon Sep 17 00:00:00 2001 From: Vadim Pisarevsky Date: Tue, 10 Apr 2012 10:53:04 +0000 Subject: [PATCH] define MIN macro in order to build opencv_ffmpeg*.dll. --- modules/highgui/src/cap_ffmpeg_impl_v2.hpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/highgui/src/cap_ffmpeg_impl_v2.hpp b/modules/highgui/src/cap_ffmpeg_impl_v2.hpp index 72fefa7..9bc2e7b 100755 --- a/modules/highgui/src/cap_ffmpeg_impl_v2.hpp +++ b/modules/highgui/src/cap_ffmpeg_impl_v2.hpp @@ -125,6 +125,10 @@ extern "C" { #include #endif +#ifndef MIN +#define MIN(a, b) ((a) < (b) ? (a) : (b)) +#endif + int get_number_of_cpus(void) { #if defined WIN32 || defined _WIN32 -- 2.7.4