RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

demux_mkv: remove unnecessary parsing for vp9 

We can finally get rid of this crap.

Depends on a ffmpeg-mpv change. Always worked with Libav (ever since
they fixed it properly).
This commit is contained in:
wm4 2017-11-17 14:17:45 +01:00
parent 35d74e1612
commit cd6f964b56
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
demux/demux_mkv.c
View File

@ -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 : ""; const char *codec = sh_v->codec ? sh_v->codec : "";
if (!strcmp(codec, "vp9")) { if (!strcmp(codec, "mjpeg"))
track->parse = true;
track->parse_timebase = 1e9;
} else if (!strcmp(codec, "mjpeg")) {
sh_v->codec_tag = MKTAG('m', 'j', 'p', 'g'); sh_v->codec_tag = MKTAG('m', 'j', 'p', 'g');
}
if (extradata_size > 0x1000000) { if (extradata_size > 0x1000000) {
MP_WARN(demuxer, "Invalid CodecPrivate\n"); MP_WARN(demuxer, "Invalid CodecPrivate\n");

2
wscript
View File

@ -426,7 +426,7 @@ iconv support use --disable-iconv.",
ffmpeg_pkg_config_checks = [ ffmpeg_pkg_config_checks = [
'libavutil', '>= 56.0.100', 'libavutil', '>= 56.0.100',
'libavcodec', '>= 58.2.100', 'libavcodec', '>= 58.4.100',
'libavformat', '>= 58.0.102', 'libavformat', '>= 58.0.102',
'libswscale', '>= 5.0.101', 'libswscale', '>= 5.0.101',
'libavfilter', '>= 7.0.101', 'libavfilter', '>= 7.0.101',