projects
/
profile
/
ivi
/
opencv.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
3b02ee4
)
define MIN macro in order to build opencv_ffmpeg*.dll.
author
Vadim Pisarevsky
<no@email>
Tue, 10 Apr 2012 10:53:04 +0000
(10:53 +0000)
committer
Vadim Pisarevsky
<no@email>
Tue, 10 Apr 2012 10:53:04 +0000
(10:53 +0000)
modules/highgui/src/cap_ffmpeg_impl_v2.hpp
patch
|
blob
|
history
diff --git
a/modules/highgui/src/cap_ffmpeg_impl_v2.hpp
b/modules/highgui/src/cap_ffmpeg_impl_v2.hpp
index
72fefa7
..
9bc2e7b
100755
(executable)
--- 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