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

Use negative track IDs for mkvmerge -i and Ogg files. Allow negative track IDs in --track-order for the same reason.

Browse Source
This commit is contained in:
Moritz Bunkus 2003-12-05 12:04:54 +00:00
parent 6d1d3e928e
commit 5075aa7ebc
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2003-12-05 Moritz Bunkus <moritz@bunkus.org>
* mkvmerge: bug fix: Negative track IDs in Ogg files were reported
incorrectly for mkvmerge -i (which affected the GUI).
2003-12-04 Moritz Bunkus <moritz@bunkus.org>
* mmg: new feature: Added "up" and "down" buttons for the tracks,

2
src/input/r_ogm.cpp
View File

@ -1033,7 +1033,7 @@ void ogm_reader_c::identify() {
memcpy(fourcc, sth->subtype, 4);
fourcc[4] = 0;
}
mxinfo("Track ID %u: %s (%s)\n", sdemuxers[i]->serial,
mxinfo("Track ID %d: %s (%s)\n", sdemuxers[i]->serial,
(sdemuxers[i]->stype == OGM_STREAM_TYPE_VORBIS ||
sdemuxers[i]->stype == OGM_STREAM_TYPE_PCM ||
sdemuxers[i]->stype == OGM_STREAM_TYPE_MP3 ||

2
src/mkvmerge.cpp
View File

@ -939,7 +939,7 @@ static void parse_track_order(const char *s, track_info_c &ti) {
parts = split(s, ",");
strip(parts);
for (i = 0; i < parts.size(); i++) {
if (!parse_int(parts[i].c_str(), id) || (id < 0))
if (!parse_int(parts[i].c_str(), id))
mxerror("'%s' is not a valid track ID in '--track-order %s'.\n",
parts[i].c_str(), s);
ti.track_order->push_back(id);