Mercurial > mplayer.hg

changeset 33152:0c2838570652

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Revert r33231, FFmpeg already sets has_b_frames up this way for frame-multithreading.
author reimar
date Sat, 09 Apr 2011 14:11:36 +0000
parents ffcc4e307a43
children 5dcbfb18ad58
files libmpcodecs/vd_ffmpeg.c
diffstat 1 files changed, 1 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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;