define MIN macro in order to build opencv_ffmpeg*.dll.

6b0ea0e0 · Vadim Pisarevsky · 3b02ee4b · 6b0ea0e0
Commit 6b0ea0e0 authored Apr 10, 2012 by Vadim Pisarevsky
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

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

No files found.
--- 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 <sys/sysctl.h>
 #endif

+#ifndef MIN
+#define MIN(a, b) ((a) < (b) ? (a) : (b))
+#endif
+
 int get_number_of_cpus(void)
 {
 #if defined WIN32 || defined _WIN32