Skip to content

Commit

Permalink
demux_mkv: remove unnecessary parsing for vp9
Browse files Browse the repository at this point in the history
We can finally get rid of this crap.

Depends on a ffmpeg-mpv change. Always worked with Libav (ever since
they fixed it properly).
  • Loading branch information
wm4 committed Nov 17, 2017
1 parent 35d74e1 commit cd6f964
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 6 deletions.
6 changes: 1 addition & 5 deletions demux/demux_mkv.c
Expand Up @@ -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");
Expand Down
2 changes: 1 addition & 1 deletion wscript
Expand Up @@ -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',
Expand Down

0 comments on commit cd6f964

Please sign in to comment.