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:
c0a0c88
)
fixed build with ffmpeg 0.5.X
author
Andrey Morozov
<no@email>
Sat, 30 Jul 2011 10:26:37 +0000
(10:26 +0000)
committer
Andrey Morozov
<no@email>
Sat, 30 Jul 2011 10:26:37 +0000
(10:26 +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
192ccc7
..
e9b0d30
100644
(file)
--- a/
modules/highgui/src/cap_ffmpeg_impl.hpp
+++ b/
modules/highgui/src/cap_ffmpeg_impl.hpp
@@
-495,6
+495,10
@@
bool CvCapture_FFMPEG::open( const char* _filename )
#if AVMEDIA_TYPE_VIDEO
#define AVMEDIA_TYPE_VIDEO CODEC_TYPE_VIDEO
+ #else
+ #ifndef AVMEDIA_TYPE_VIDEO
+ #define AVMEDIA_TYPE_VIDEO CODEC_TYPE_VIDEO
+ #endif
#endif
if( AVMEDIA_TYPE_VIDEO == enc->codec_type && video_stream < 0) {