From 1ef8d887d425c42de004e5fda7d2f9376097aa8a Mon Sep 17 00:00:00 2001 From: Uoti Urpala Date: Wed, 20 Jan 2010 20:31:05 +0200 Subject: [PATCH] vd_ffmpeg: FFmpeg-mt changed has_b_frames API, update --- libmpcodecs/vd_ffmpeg.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libmpcodecs/vd_ffmpeg.c b/libmpcodecs/vd_ffmpeg.c index 3569e55abf..1610f6dce3 100644 --- a/libmpcodecs/vd_ffmpeg.c +++ b/libmpcodecs/vd_ffmpeg.c @@ -135,8 +135,9 @@ static int control(sh_video_t *sh, int cmd, void *arg, ...){ return CONTROL_TRUE; case VDCTRL_QUERY_UNSEEN_FRAMES:; int delay = avctx->has_b_frames; -#ifdef FF_THREAD_FRAME +#if defined(FF_THREAD_FRAME) && LIBAVCODEC_VERSION_MAJOR <= 52 && LIBAVCODEC_VERSION_MINOR < 49 // FFmpeg-mt has extra delay when using frame threading + // In newer versions that is included in has_b_frames if (avctx->thread_type & FF_THREAD_FRAME) delay += avctx->thread_count - 1; #endif