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

[reimar]

Author: reimar
Date: Sat Mar 26 13:43:19 2011
New Revision: 33114

Log:
Do not use deprecated avcodec_thread_init, it is broken and does nothing currently.
Set thread_count directly instead.

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

Modified: trunk/libmpcodecs/vd_ffmpeg.c
==============================================================================
--- trunk/libmpcodecs/vd_ffmpeg.c	Fri Mar 25 14:58:26 2011	(r33113)
+++ trunk/libmpcodecs/vd_ffmpeg.c	Sat Mar 26 13:43:19 2011	(r33114)
@@ -438,8 +438,7 @@ static int init(sh_video_t *sh){
     if(sh->bih)
         avctx->bits_per_coded_sample= sh->bih->biBitCount;
 
-    if(lavc_param_threads > 1)
-        avcodec_thread_init(avctx, lavc_param_threads);
+    avctx->thread_count = lavc_param_threads;
     /* 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	Fri Mar 25 14:58:26 2011	(r33113)
+++ trunk/libmpcodecs/ve_lavc.c	Sat Mar 26 13:43:19 2011	(r33114)
@@ -689,8 +689,7 @@ static int config(struct vf_instance *vf
 	vf->priv->pic->quality = (int)(FF_QP2LAMBDA * lavc_param_vqscale + 0.5);
     }
 
-    if(lavc_param_threads > 1)
-	avcodec_thread_init(lavc_venc_context, lavc_param_threads);
+    lavc_venc_context->thread_count = lavc_param_threads;
 
     if (avcodec_open(lavc_venc_context, vf->priv->codec) != 0) {
 	mp_msg(MSGT_MENCODER,MSGL_ERR,MSGTR_CantOpenCodec);