[MPlayer-cvslog] r33128 - trunk/libmpcodecs/vd_ffmpeg.c

[reimar]

Author: reimar
Date: Sun Mar 27 15:18:59 2011
New Revision: 33128

Log:
Attempt to fix crashes with VDPAU and threads.

Modified:
   trunk/libmpcodecs/vd_ffmpeg.c

Modified: trunk/libmpcodecs/vd_ffmpeg.c
==============================================================================
--- trunk/libmpcodecs/vd_ffmpeg.c	Sun Mar 27 15:09:27 2011	(r33127)
+++ trunk/libmpcodecs/vd_ffmpeg.c	Sun Mar 27 15:18:59 2011	(r33128)
@@ -238,7 +238,12 @@ static void set_format_params(struct AVC
         vd_ffmpeg_ctx *ctx = sh->context;
         ctx->do_dr1    = 1;
         ctx->do_slices = 1;
+        // HACK: FFmpeg thread handling is a major mess and
+        // hinders any attempt to decide on hwaccel after the
+        // codec is open. We really want this to change, so
+        // just beat it until it's dead
         avctx->thread_count    = 1;
+        avctx->active_thread_type = 0;
         avctx->get_buffer      = get_buffer;
         avctx->release_buffer  = release_buffer;
         avctx->reget_buffer    = get_buffer;