fixed of the ticket #1442

196ac49f · Andrey Morozov · bb33f8dd · 196ac49f
显示空白变更内容
内联并排

Showing with 2 addition and 1 deletion

modules/highgui/src/cap_ffmpeg_impl.hpp modules/highgui/src/cap_ffmpeg_impl.hpp +2 -1

未找到文件。
--- 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);