git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches...

diff --git a/modules/ffmpeg/producer/tbb_avcodec.cpp b/modules/ffmpeg/producer/tbb_avcodec.cpp
index 76aed5e6b69a0c795ec4a56dbeeefdda0bbc9fa9..945e7f2b2ab542e755d26f4eb00799d5ab910ad2 100644 (file)
--- a/modules/ffmpeg/producer/tbb_avcodec.cpp
+++ b/modules/ffmpeg/producer/tbb_avcodec.cpp
@@ -105,8 +105,8 @@ void thread_free(AVCodecContext* s)
 int tbb_avcodec_open(AVCodecContext* avctx, AVCodec* codec)\r
 {\r
        avctx->thread_count = 1;\r
-       // Some codecs don't like to have multiple multithreaded decoding instances. Only enable for those we know work.\r
-       if((codec->capabilities & CODEC_CAP_SLICE_THREADS) && (avctx->thread_type & FF_THREAD_SLICE))   \r
+\r
+       if(codec->capabilities & CODEC_CAP_SLICE_THREADS)       \r
                thread_init(avctx);\r
        \r
        // ff_thread_init will not be executed since thread_opaque != nullptr || thread_count == 1.\r