From a2fa0d0b68ce200598122145254f56ae1adff91e Mon Sep 17 00:00:00 2001 From: wm4 Date: Tue, 18 Oct 2016 19:14:15 +0200 Subject: demux_lavf: don't accidentally enable edit list crap on Libav You really don't get a break from all the multiple bullshit. --- demux/demux_lavf.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'demux') diff --git a/demux/demux_lavf.c b/demux/demux_lavf.c index 5aed536bf4..0188801aba 100644 --- a/demux/demux_lavf.c +++ b/demux/demux_lavf.c @@ -938,7 +938,8 @@ static int demux_lavf_fill_buffer(demuxer_t *demux) #endif dp->pos = pkt->pos; dp->keyframe = pkt->flags & AV_PKT_FLAG_KEY; -#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(57, 50, 100) +#if LIBAVFORMAT_VERSION_MICRO >= 100 && \ + LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(57, 50, 100) if (pkt->flags & AV_PKT_FLAG_DISCARD) MP_ERR(demux, "Edit lists are not correctly supported (FFmpeg issue).\n"); #endif -- cgit v1.2.3