[MPlayer-cvslog] r33115 - in trunk/libmpcodecs: vd_ffmpeg.c ve_lavc.c

[reimar]

Author: reimar
Date: Sat Mar 26 14:00:11 2011
New Revision: 33115

Log:
Enable both frame and slice threading.

Modified:
   trunk/libmpcodecs/vd_ffmpeg.c
   trunk/libmpcodecs/ve_lavc.c

Modified: trunk/libmpcodecs/vd_ffmpeg.c
==============================================================================
--- trunk/libmpcodecs/vd_ffmpeg.c	Sat Mar 26 13:43:19 2011	(r33114)
+++ trunk/libmpcodecs/vd_ffmpeg.c	Sat Mar 26 14:00:11 2011	(r33115)
@@ -439,6 +439,7 @@ static int init(sh_video_t *sh){
         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);

Modified: trunk/libmpcodecs/ve_lavc.c
==============================================================================
--- trunk/libmpcodecs/ve_lavc.c	Sat Mar 26 13:43:19 2011	(r33114)
+++ trunk/libmpcodecs/ve_lavc.c	Sat Mar 26 14:00:11 2011	(r33115)
@@ -690,6 +690,7 @@ static int config(struct vf_instance *vf
     }
 
     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);