summaryrefslogtreecommitdiffstats
path: root/libmpcodecs/vd_ffmpeg.c
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2010-01-20 20:31:05 +0200
committerUoti Urpala <uau@glyph.nonexistent.invalid>2010-01-20 20:32:00 +0200
commit1ef8d887d425c42de004e5fda7d2f9376097aa8a (patch)
tree263a9f45e4e09e7d390f06cdcaf435a98ff5b5fa /libmpcodecs/vd_ffmpeg.c
parentd4159a7d883bd90028db1d76f384bf2574416858 (diff)
downloadmpv-1ef8d887d425c42de004e5fda7d2f9376097aa8a.tar.bz2
mpv-1ef8d887d425c42de004e5fda7d2f9376097aa8a.tar.xz
vd_ffmpeg: FFmpeg-mt changed has_b_frames API, update
Diffstat (limited to 'libmpcodecs/vd_ffmpeg.c')
-rw-r--r--libmpcodecs/vd_ffmpeg.c3
1 files changed, 2 insertions, 1 deletions
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