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

demux_mkv: fix x264 hack if video track uses header compression 

The x264 hack requires reading the first video packet, which in turn we
handle with a hack in demux_mkv.c to get the packet without having to
add special crap to demux.c. Another useless MKV feature (which they
enabled by default at one point and which caused many demuxers to break
completely, only to disable it again when it was too late) conflicts
with this, because we actually pass a block as packet contents, instead
of after "decompression".

Fix this by calling demux_mkv_decode().
This commit is contained in:
wm4 2017-12-29 16:00:44 +01:00 committed by Kevin Mitchell
parent d9ca235c68
commit ff506c1e49
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
demux/demux_mkv.c
View File

@ -1909,8 +1909,14 @@ static void probe_x264_garbage(demuxer_t *demuxer)
if (!block || block->num_laces < 1)
continue;
sh->codec->first_packet = new_demux_packet_from_buf(block->laces[0]);
bstr sblock = {block->laces[0]->data, block->laces[0]->size};
bstr nblock = demux_mkv_decode(demuxer->log, track, sblock, 1);
sh->codec->first_packet = new_demux_packet_from(nblock.start, nblock.len);
talloc_steal(mkv_d, sh->codec->first_packet);
if (nblock.start != sblock.start)
talloc_free(nblock.start);
}
}