diff --git a/demux/demux_mkv.c b/demux/demux_mkv.c index 600ecdf5a6..90c027188f 100644 --- a/demux/demux_mkv.c +++ b/demux/demux_mkv.c @@ -1462,12 +1462,8 @@ static int demux_mkv_open_video(demuxer_t *demuxer, mkv_track_t *track) } const char *codec = sh_v->codec ? sh_v->codec : ""; - if (!strcmp(codec, "vp9")) { - track->parse = true; - track->parse_timebase = 1e9; - } else if (!strcmp(codec, "mjpeg")) { + if (!strcmp(codec, "mjpeg")) sh_v->codec_tag = MKTAG('m', 'j', 'p', 'g'); - } if (extradata_size > 0x1000000) { MP_WARN(demuxer, "Invalid CodecPrivate\n"); diff --git a/wscript b/wscript index 002c0a579f..cbff083f59 100644 --- a/wscript +++ b/wscript @@ -426,7 +426,7 @@ iconv support use --disable-iconv.", ffmpeg_pkg_config_checks = [ 'libavutil', '>= 56.0.100', - 'libavcodec', '>= 58.2.100', + 'libavcodec', '>= 58.4.100', 'libavformat', '>= 58.0.102', 'libswscale', '>= 5.0.101', 'libavfilter', '>= 7.0.101',