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

[reimar]

Author: reimar
Date: Tue Aug  9 21:15:19 2011
New Revision: 33957

Log:
Fix neverending "DRI Failure" messages with frame multithreading.

Modified:
   trunk/libmpcodecs/vd_ffmpeg.c

Modified: trunk/libmpcodecs/vd_ffmpeg.c
==============================================================================
--- trunk/libmpcodecs/vd_ffmpeg.c	Tue Aug  9 20:53:43 2011	(r33956)
+++ trunk/libmpcodecs/vd_ffmpeg.c	Tue Aug  9 21:15:19 2011	(r33957)
@@ -651,7 +651,11 @@ static int get_buffer(AVCodecContext *av
             mp_msg(MSGT_DECVIDEO, MSGL_WARN, MSGTR_MPCODECS_DRIFailure);
 
             ctx->do_dr1=0; //FIXME
+            // For frame-multithreading these contexts aren't
+            // the same and must both be updated.
+            ctx->avctx->get_buffer=
             avctx->get_buffer= avcodec_default_get_buffer;
+            ctx->avctx->reget_buffer=
             avctx->reget_buffer= avcodec_default_reget_buffer;
             if (pic->data[0])
                 release_buffer(avctx, pic);