diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-02-15 17:17:43 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-02-15 17:17:43 +0300 |
commit | ca5fdd857b7864b0336aca655f2c04d00090c0f9 (patch) | |
tree | 5e19a8ec6a5c08ba9d6e8cf1f98cd7d9980a5f23 /source/gameengine | |
parent | df1c88b652e6977491b7f2b019c326518ccdc320 (diff) | |
parent | 2aef87bfae4a6a91f626780767aab68b7791c9d4 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/gameengine')
-rw-r--r-- | source/gameengine/VideoTexture/VideoFFmpeg.cpp | 6 |
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; |