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 b77e0cd6a5f229747915cac6fccf7c7d34893aa1..76aed5e6b69a0c795ec4a56dbeeefdda0bbc9fa9 100644 (file)
--- a/modules/ffmpeg/producer/tbb_avcodec.cpp
+++ b/modules/ffmpeg/producer/tbb_avcodec.cpp
@@ -104,16 +104,11 @@ void thread_free(AVCodecContext* s)
 \r
 int tbb_avcodec_open(AVCodecContext* avctx, AVCodec* codec)\r
 {\r
-       //CodecID supported_codecs[] = {CODEC_ID_MPEG2VIDEO, CODEC_ID_PRORES, CODEC_ID_FFV1};\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(//std::find(std::begin(supported_codecs), std::end(supported_codecs), codec->id) != std::end(supported_codecs) && \r
-         (codec->capabilities & CODEC_CAP_SLICE_THREADS) && \r
-         (avctx->thread_type & FF_THREAD_SLICE)) \r
-       {\r
+       if((codec->capabilities & CODEC_CAP_SLICE_THREADS) && (avctx->thread_type & FF_THREAD_SLICE))   \r
                thread_init(avctx);\r
-       }       \r
+       \r
        // ff_thread_init will not be executed since thread_opaque != nullptr || thread_count == 1.\r
        return avcodec_open(avctx, codec); \r
 }\r