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:
5ebc183
)
Update FFMPEG wrapper binaries
author
Alexander Reshetnikov
<no@email>
Fri, 23 Mar 2012 10:59:06 +0000
(10:59 +0000)
committer
Alexander Reshetnikov
<no@email>
Fri, 23 Mar 2012 10:59:06 +0000
(10:59 +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
fdaa2f0
..
84ab51d
100755
(executable)
--- a/
modules/highgui/src/cap_ffmpeg_impl_v2.hpp
+++ b/
modules/highgui/src/cap_ffmpeg_impl_v2.hpp
@@
-41,7
+41,6
@@
//M*/
#include "cap_ffmpeg_api.hpp"
-#include "ffmpeg_codecs.hpp"
#include <assert.h>
#include <algorithm>
@@
-66,6
+65,8
@@
extern "C" {
#include <errno.h>
#endif
+#include "ffmpeg_codecs.hpp"
+
#ifdef WIN32
#define HAVE_FFMPEG_SWSCALE 1
#include <libavformat/avformat.h>