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

[reimar]

Author: reimar
Date: Sat Dec  3 19:43:54 2011
New Revision: 34379

Log:
Finally apply forgotten patch to fix VDCTRL_QUERY_UNSEEN_FRAMES result for vd_ffmpeg.

Modified:
   trunk/libmpcodecs/vd_ffmpeg.c

Modified: trunk/libmpcodecs/vd_ffmpeg.c
==============================================================================
--- trunk/libmpcodecs/vd_ffmpeg.c	Sat Dec  3 09:03:12 2011	(r34378)
+++ trunk/libmpcodecs/vd_ffmpeg.c	Sat Dec  3 19:43:54 2011	(r34379)
@@ -180,8 +180,10 @@ static int control(sh_video_t *sh, int c
         avcodec_flush_buffers(avctx);
         return CONTROL_TRUE;
     case VDCTRL_QUERY_UNSEEN_FRAMES:
-        // has_b_frames includes delay due to frame-multithreading
-        return avctx->has_b_frames + 10;
+        // "has_b_frames" contains the (e.g. reorder) delay as sepcified
+        // in the standard. "delay" contains the libavcodec-specific delay
+        // e.g. due to frame multithreading
+        return avctx->has_b_frames + avctx->delay + 10;
     }
     return CONTROL_UNKNOWN;
 }