projects
/
platform
/
upstream
/
opencv.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c47c1ad
)
fixed compilation FFMPEG wrapper on Windows
author
Alexander Shishkov
<no@email>
Thu, 15 Mar 2012 07:22:31 +0000
(07:22 +0000)
committer
Alexander Shishkov
<no@email>
Thu, 15 Mar 2012 07:22:31 +0000
(07:22 +0000)
modules/highgui/src/cap_ffmpeg_impl.hpp
patch
|
blob
|
history
diff --git
a/modules/highgui/src/cap_ffmpeg_impl.hpp
b/modules/highgui/src/cap_ffmpeg_impl.hpp
index
a2c6166
..
7743d54
100644
(file)
--- a/
modules/highgui/src/cap_ffmpeg_impl.hpp
+++ b/
modules/highgui/src/cap_ffmpeg_impl.hpp
@@
-41,6
+41,7
@@
#include "cap_ffmpeg_api.hpp"
#include <assert.h>
+#include <algorithm>
#if defined _MSC_VER && _MSC_VER >= 1200
#pragma warning( disable: 4244 4510 4512 4610 )