summaryrefslogtreecommitdiffstats
path: root/libmpcodecs
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2010-05-04 04:50:57 +0300
committerUoti Urpala <uau@glyph.nonexistent.invalid>2010-05-04 04:50:57 +0300
commitbc767c2a98ab0a0988313b0394561f0f791ac59a (patch)
tree49a9856dede70175d1aaf5d674bacc3c1cbaf6e8 /libmpcodecs
parent035611f0a773b1e8e8eb0f2ba8cf94933392605f (diff)
downloadmpv-bc767c2a98ab0a0988313b0394561f0f791ac59a.tar.bz2
mpv-bc767c2a98ab0a0988313b0394561f0f791ac59a.tar.xz
vd_ffmpeg: use skip_frame instead of deprecated hurry_up field
Diffstat (limited to 'libmpcodecs')
-rw-r--r--libmpcodecs/vd_ffmpeg.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/libmpcodecs/vd_ffmpeg.c b/libmpcodecs/vd_ffmpeg.c
index dfd19c2817..72a19cd14d 100644
--- a/libmpcodecs/vd_ffmpeg.c
+++ b/libmpcodecs/vd_ffmpeg.c
@@ -749,7 +749,12 @@ static struct mp_image *decode(struct sh_video *sh, void *data, int len,
}
}
- avctx->hurry_up=(flags&3)?((flags&2)?2:1):0;
+ if (flags & 2)
+ avctx->skip_frame = AVDISCARD_ALL;
+ else if (flags & 1)
+ avctx->skip_frame = AVDISCARD_NONREF;
+ else
+ avctx->skip_frame = 0;
mp_msg(MSGT_DECVIDEO, MSGL_DBG2, "vd_ffmpeg data: %04x, %04x, %04x, %04x\n",
((int *)data)[0], ((int *)data)[1], ((int *)data)[2], ((int *)data)[3]);