From 196ac49fcf9e7f9c591815bb4e30be675a0ed511 Mon Sep 17 00:00:00 2001 From: Andrey Morozov Date: Thu, 26 Jan 2012 11:36:12 +0000 Subject: [PATCH] fixed of the ticket #1442 --- modules/highgui/src/cap_ffmpeg_impl.hpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/highgui/src/cap_ffmpeg_impl.hpp b/modules/highgui/src/cap_ffmpeg_impl.hpp index 1b33749..9c833be 100644 --- 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); -- 2.7.4