# HG changeset patch # User reimar # Date 1302358296 0 # Node ID 0c2838570652cb0c3d81a01f805e5988fd64907a # Parent ffcc4e307a43f26f6312b1a910a02879c3905fe5 Revert r33231, FFmpeg already sets has_b_frames up this way for frame-multithreading. diff -r ffcc4e307a43 -r 0c2838570652 libmpcodecs/vd_ffmpeg.c --- a/libmpcodecs/vd_ffmpeg.c Sat Apr 09 04:12:03 2011 +0000 +++ b/libmpcodecs/vd_ffmpeg.c Sat Apr 09 14:11:36 2011 +0000 @@ -173,8 +173,7 @@ 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;