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:
750c56c
)
minor fix for ffmpeg
author
Andrey Morozov
<no@email>
Fri, 29 Jul 2011 14:37:54 +0000
(14:37 +0000)
committer
Andrey Morozov
<no@email>
Fri, 29 Jul 2011 14:37:54 +0000
(14:37 +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
147a525
..
3ae00d5
100644
(file)
--- a/
modules/highgui/src/cap_ffmpeg_impl.hpp
+++ b/
modules/highgui/src/cap_ffmpeg_impl.hpp
@@
-491,11
+491,11
@@
bool CvCapture_FFMPEG::open( const char* _filename )
AVCodecContext *enc = &ic->streams[i]->codec;
#endif
-
avcodec_thread_init(enc, count_threads);
+ avcodec_thread_init(enc, count_threads);
-
//
#ifndef AVMEDIA_TYPE_VIDEO
-
//
#define AVMEDIA_TYPE_VIDEO CODEC_TYPE_VIDEO
-
//
#endif
+ #ifndef AVMEDIA_TYPE_VIDEO
+ #define AVMEDIA_TYPE_VIDEO CODEC_TYPE_VIDEO
+ #endif
if( AVMEDIA_TYPE_VIDEO == enc->codec_type && video_stream < 0) {
AVCodec *codec = avcodec_find_decoder(enc->codec_id);