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

[reimar]

Author: reimar
Date: Sat Apr  9 16:11:36 2011
New Revision: 33239

Log:
Revert r33231, FFmpeg already sets has_b_frames up this way for
frame-multithreading.

Modified:
   trunk/libmpcodecs/vd_ffmpeg.c

Modified: trunk/libmpcodecs/vd_ffmpeg.c
==============================================================================
--- trunk/libmpcodecs/vd_ffmpeg.c	Sat Apr  9 06:12:03 2011	(r33238)
+++ trunk/libmpcodecs/vd_ffmpeg.c	Sat Apr  9 16:11:36 2011	(r33239)
@@ -173,8 +173,7 @@ static int control(sh_video_t *sh, int c
         avcodec_flush_buffers(avctx);
         return CONTROL_TRUE;
     case VDCTRL_QUERY_UNSEEN_FRAMES:
-        if (avctx->active_thread_type & FF_THREAD_FRAME)
-          return avctx->has_b_frames + avctx->thread_count + 10;
+        // has_b_frames includes delay due to frame-multithreading
         return avctx->has_b_frames + 10;
     }
     return CONTROL_UNKNOWN;