Skip to content

O
opencv
Commit 6b0ea0e0 authored by Vadim Pisarevsky's avatar Vadim Pisarevsky
Browse files
Options

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

parent 3b02ee4b
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 0 deletions
modules/highgui/src/cap_ffmpeg_impl_v2.hpp
View file @ 6b0ea0e0
...@@ -125,6 +125,10 @@ extern "C" { ...@@ -125,6 +125,10 @@ extern "C" {
#include <sys/sysctl.h> #include <sys/sysctl.h>
#endif #endif
#ifndef MIN
#define MIN(a, b) ((a) < (b) ? (a) : (b))
#endif
int get_number_of_cpus(void) int get_number_of_cpus(void)
{ {
#if defined WIN32 || defined _WIN32 #if defined WIN32 || defined _WIN32
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment