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

diff --git a/modules/ffmpeg/tbb_avcodec.cpp b/modules/ffmpeg/tbb_avcodec.cpp
index 2e01cd87a50b6724490e85c10c0ab1ab96598110..2789fcbedea21fd3b4d5983384cd1530fe80f237 100644 (file)
--- a/modules/ffmpeg/tbb_avcodec.cpp
+++ b/modules/ffmpeg/tbb_avcodec.cpp
@@ -86,8 +86,7 @@ int tbb_avcodec_open(AVCodecContext* avctx, AVCodec* codec)
 {\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->id == CODEC_ID_MPEG2VIDEO ||\r
-               codec->id == CODEC_ID_H264) && \r
+       if((codec->id == CODEC_ID_MPEG2VIDEO) && \r
          (codec->capabilities & CODEC_CAP_SLICE_THREADS) && \r
          (avctx->thread_type & FF_THREAD_SLICE))\r
        {\r