Merging this PR from #416 into release branch. Tested locally and did…

… not see any crazy memory demands from this.
OpenShot · Feb 7, 2020 · eb701a5 · eb701a5
1 parent f801af2
commit eb701a5
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/Qt/VideoCacheThread.cpp b/src/Qt/VideoCacheThread.cpp
@@ -29,13 +29,14 @@
  */
 
 #include "../../include/Qt/VideoCacheThread.h"
+#include <algorithm>
 
 namespace openshot
 {
 	// Constructor
 	VideoCacheThread::VideoCacheThread()
 	: Thread("video-cache"), speed(1), is_playing(false), position(1)
-	, reader(NULL), max_frames(OPEN_MP_NUM_PROCESSORS * 2), current_display_frame(1)
+	, reader(NULL), max_frames(std::min(OPEN_MP_NUM_PROCESSORS * 8, 64)), current_display_frame(1)
     {
     }