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:
bb33f8d
)
fixed of the ticket #1442
author
Andrey Morozov
<no@email>
Thu, 26 Jan 2012 11:36:12 +0000
(11:36 +0000)
committer
Andrey Morozov
<no@email>
Thu, 26 Jan 2012 11:36:12 +0000
(11:36 +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
1b33749
..
9c833be
100644
(file)
--- a/
modules/highgui/src/cap_ffmpeg_impl.hpp
+++ b/
modules/highgui/src/cap_ffmpeg_impl.hpp
@@
-464,6
+464,7
@@
void CvCapture_FFMPEG::close()
}
+
init();
}
@@
-491,7
+492,7
@@
bool CvCapture_FFMPEG::reopen()
AVCodecContext *enc = &ic->streams[video_stream]->codec;
#endif
- avcodec_thread_init(enc,
get_number_of_cpus(
));
+ avcodec_thread_init(enc,
std::min(get_number_of_cpus(), 16
));
AVCodec *codec = avcodec_find_decoder(enc->codec_id);
avcodec_open(enc, codec);