]> git.sesse.net Git - casparcg/commitdiff
git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches...
authorronag <ronag@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Mon, 28 Nov 2011 22:46:46 +0000 (22:46 +0000)
committerronag <ronag@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Mon, 28 Nov 2011 22:46:46 +0000 (22:46 +0000)
modules/ffmpeg/producer/tbb_avcodec.cpp

index 753b1f04d9f983dcb7fe5daa91f909e7a695845f..3d8181f092f6073f438d046f34f2de77b7337a65 100644 (file)
@@ -73,7 +73,7 @@ void thread_init(AVCodecContext* s)
        s->thread_opaque          = &dummy_opaque; \r
     s->execute                   = thread_execute;\r
     s->execute2                          = thread_execute2;\r
-    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. \r
+    s->thread_count              = tbb::tbb_thread::hardware_concurrency(); // MAX_THREADS; // We are using a task-scheduler, so use as many "threads/tasks" as possible. \r
 \r
        CASPAR_LOG(info) << "Initialized ffmpeg tbb context.";\r
 }\r