X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fffmpeg%2Fproducer%2Ftbb_avcodec.cpp;h=753b1f04d9f983dcb7fe5daa91f909e7a695845f;hb=32fceed6d11e6eca98b449f6b9207d8956a115d3;hp=3082238385717645d980003863c7505a278af035;hpb=acdd8abe7f0f1897db2e51536d683706f46d7712;p=casparcg

diff --git a/modules/ffmpeg/producer/tbb_avcodec.cpp b/modules/ffmpeg/producer/tbb_avcodec.cpp
index 308223838..753b1f04d 100644
--- a/modules/ffmpeg/producer/tbb_avcodec.cpp
+++ b/modules/ffmpeg/producer/tbb_avcodec.cpp
@@ -73,7 +73,7 @@ void thread_init(AVCodecContext* s)
 	s->thread_opaque	  = &dummy_opaque; 
     s->execute			  = thread_execute;
     s->execute2			  = thread_execute2;
-    s->thread_count		  = tbb::tbb_thread::hardware_concurrency(); // MAX_THREADS; // We are using a task-scheduler, so use as many "threads/tasks" as possible. 
+    s->thread_count		  = MAX_THREADS;//tbb::tbb_thread::hardware_concurrency(); // MAX_THREADS; // We are using a task-scheduler, so use as many "threads/tasks" as possible. 
 
 	CASPAR_LOG(info) << "Initialized ffmpeg tbb context.";
 }
@@ -90,7 +90,7 @@ void thread_free(AVCodecContext* s)
 
 int tbb_avcodec_open(AVCodecContext* avctx, AVCodec* codec)
 {
-	CodecID supported_codecs[] = {CODEC_ID_MPEG2VIDEO, CODEC_ID_PRORES};
+	CodecID supported_codecs[] = {CODEC_ID_MPEG2VIDEO, CODEC_ID_PRORES, CODEC_ID_FFV1};
 
 	avctx->thread_count = 1;
 	// Some codecs don't like to have multiple multithreaded decoding instances. Only enable for those we know work.