Download-Tools/mkvtoolnix
1
0
Fork 0
mirror of https://gitlab.com/mbunkus/mkvtoolnix.git synced 2024-12-24 20:01:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Accept streams whose comment packet is missing, e.g. files created by Cyrius' OGMuxer.

Browse Source
This commit is contained in:
Moritz Bunkus 2004-03-13 10:49:50 +00:00
parent 442e082b3c
commit ef01d41faa
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2004-03-13 Moritz Bunkus <moritz@bunkus.org>
* mkvmerge: bug fix: OGMs created by Cyrius OGMuxer are missing
comment packets for some streams which mkvmerge choked on.
2004-03-10 Moritz Bunkus <moritz@bunkus.org>
* mkvmerge/mmg: bug fix: The LANGUAGE and TITLE comments from OGM

14
src/input/r_ogm.cpp
View File

@ -984,10 +984,10 @@ ogm_reader_c::process_header_page(ogg_page *og) {
dmx = find_demuxer(ogg_page_serialno(og));
if (dmx == NULL)
return;
if (dmx->stype == OGM_STREAM_TYPE_FLAC) {
if (dmx->headers_read)
return;
if (dmx->stype == OGM_STREAM_TYPE_FLAC) {
#if defined HAVE_FLAC_FORMAT_H
ogg_stream_pagein(&dmx->os, og);
while ((dmx->packet_data.size() < dmx->flac_header_packets) &&
@ -1012,6 +1012,13 @@ ogm_reader_c::process_header_page(ogg_page *og) {
ogg_stream_pagein(&dmx->os, og);
while (ogg_stream_packetout(&dmx->os, &op) == 1) {
if ((dmx->stype != OGM_STREAM_TYPE_VORBIS) &&
((op.packet[0] & PACKET_TYPE_BITS) != 1)) {
mxverb(2, "ogm_reader: Missing header/comment packets for %d.\n",
dmx->serial);
dmx->headers_read = true;
return;
}
dmx->packet_data.push_back((unsigned char *)
safememdup(op.packet, op.bytes));
dmx->packet_sizes.push_back(op.bytes);
@ -1227,7 +1234,8 @@ ogm_reader_c::handle_stream_comments() {
for (i = 0; i < num_sdemuxers; i++) {
dmx = sdemuxers[i];
if (dmx->stype == OGM_STREAM_TYPE_FLAC)
if ((dmx->stype == OGM_STREAM_TYPE_FLAC) ||
(dmx->packet_data.size() < 2))
continue;
comments = extract_vorbis_comments(dmx->packet_data[1],
dmx->packet_sizes[1]);