# HG changeset patch
# User reimar
# Date 1301144411 0
# Node ID 038ff73f9894024a370ba8e8957edeb30713a759
# Parent  55de45e1d943246cabacf8d9d13699460e97beba
Enable both frame and slice threading.

diff -r 55de45e1d943 -r 038ff73f9894 libmpcodecs/vd_ffmpeg.c
--- a/libmpcodecs/vd_ffmpeg.c	Sat Mar 26 12:43:19 2011 +0000
+++ b/libmpcodecs/vd_ffmpeg.c	Sat Mar 26 13:00:11 2011 +0000
@@ -439,6 +439,7 @@
         avctx->bits_per_coded_sample= sh->bih->biBitCount;
 
     avctx->thread_count = lavc_param_threads;
+    avctx->thread_type = FF_THREAD_FRAME | FF_THREAD_SLICE;
     /* open it */
     if (avcodec_open(avctx, lavc_codec) < 0) {
         mp_msg(MSGT_DECVIDEO, MSGL_ERR, MSGTR_CantOpenCodec);
diff -r 55de45e1d943 -r 038ff73f9894 libmpcodecs/ve_lavc.c
--- a/libmpcodecs/ve_lavc.c	Sat Mar 26 12:43:19 2011 +0000
+++ b/libmpcodecs/ve_lavc.c	Sat Mar 26 13:00:11 2011 +0000
@@ -690,6 +690,7 @@
     }
 
     lavc_venc_context->thread_count = lavc_param_threads;
+    lavc_venc_context->thread_type = FF_THREAD_FRAME | FF_THREAD_SLICE;
 
     if (avcodec_open(lavc_venc_context, vf->priv->codec) != 0) {
 	mp_msg(MSGT_MENCODER,MSGL_ERR,MSGTR_CantOpenCodec);