aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/x264.c
diff options
context:
space:
mode:
authorMåns Rullgård <mans@mansr.com>2005-05-30 20:34:02 +0000
committerMåns Rullgård <mans@mansr.com>2005-05-30 20:34:02 +0000
commit568d4b810f940710c3e5bc81210aaa2323a0bb7b (patch)
treeb3e2056f683d9a9315bf87768275e37f8ff03134 /libavcodec/x264.c
parent9a9d530126f72390e00f45b2fd4848a27b056eff (diff)
downloadffmpeg-568d4b810f940710c3e5bc81210aaa2323a0bb7b.tar.gz
enable x264 multi-threading
Originally committed as revision 4325 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/x264.c')
-rw-r--r--libavcodec/x264.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/x264.c b/libavcodec/x264.c
index 0f84139de1..0e850f5739 100644
--- a/libavcodec/x264.c
+++ b/libavcodec/x264.c
@@ -154,6 +154,8 @@ X264_init(AVCodecContext *avctx)
x4->params.i_fps_num = avctx->time_base.den;
x4->params.i_fps_den = avctx->time_base.num;
+ x4->params.i_threads = avctx->thread_count;
+
x4->enc = x264_encoder_open(&x4->params);
if(!x4->enc)
return -1;