Merge branch 'master' into blender2.8

1 files changed, 3 insertions, 3 deletions

diff --git a/source/gameengine/VideoTexture/VideoFFmpeg.cpp b/source/gameengine/VideoTexture/VideoFFmpeg.cpp
index 083e9e28502..10196804656 100644
--- a/source/gameengine/VideoTexture/VideoFFmpeg.cpp
+++ b/source/gameengine/VideoTexture/VideoFFmpeg.cpp
@@ -467,8 +467,8 @@ bool VideoFFmpeg::startCache()
 			CachePacket *packet = new CachePacket();
 			BLI_addtail(&m_packetCacheFree, packet);
 		}
-		BLI_init_threads(&m_thread, cacheThread, 1);
-		BLI_insert_thread(&m_thread, this);
+		BLI_threadpool_init(&m_thread, cacheThread, 1);
+		BLI_threadpool_insert(&m_thread, this);
 		m_cacheStarted = true;
 	}
 	return m_cacheStarted;
@@ -479,7 +479,7 @@ void VideoFFmpeg::stopCache()
 	if (m_cacheStarted)
 	{
 		m_stopThread = true;
-		BLI_end_threads(&m_thread);
+		BLI_threadpool_end(&m_thread);
 		// now delete the cache
 		CacheFrame *frame;
 		CachePacket *packet;