summaryrefslogtreecommitdiffstats
path: root/demux/demux_lavf.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2016-10-18 19:14:15 +0200
committerwm4 <wm4@nowhere>2016-10-18 19:14:15 +0200
commita2fa0d0b68ce200598122145254f56ae1adff91e (patch)
tree3fbcea8b3b2b1f96099f24911791570939d48436 /demux/demux_lavf.c
parentb86a2316df260de70012fb05dbddf06118b00611 (diff)
downloadmpv-a2fa0d0b68ce200598122145254f56ae1adff91e.tar.bz2
mpv-a2fa0d0b68ce200598122145254f56ae1adff91e.tar.xz
demux_lavf: don't accidentally enable edit list crap on Libav
You really don't get a break from all the multiple bullshit.
Diffstat (limited to 'demux/demux_lavf.c')
-rw-r--r--demux/demux_lavf.c3
1 files changed, 2 insertions, 1 deletions
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