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

Convert the format used in wxString::Format() first because it might be redefined on Windows (%lld vs %I64d). This bug was introduced in commit 3121. Fixes Anthill bug #160.

Browse Source
This commit is contained in:
Moritz Bunkus 2005-11-01 21:26:07 +00:00
parent f5c76a2f55
commit 21ea80f751
3 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2005-11-01 Moritz Bunkus <moritz@bunkus.org>
* mmg: bug fix: Appending tracks was broken because the track
numbers in the command line were incorrect. Fixes Anthill bug
#160.
2005-10-23 Moritz Bunkus <moritz@bunkus.org> 2005-10-23 Moritz Bunkus <moritz@bunkus.org>
* mkvmerge: new feature: Added support for Ogg/Theora. * mkvmerge: new feature: Added support for Ogg/Theora.

8
src/mmg/mmg.cpp
View File

@ -549,8 +549,10 @@ wxString
create_track_order(bool all) { create_track_order(bool all) {
int i; int i;
wxString s, format; wxString s, format;
string temp;
format = wxT("%d:" LLD); fix_format("%d:" LLD, temp);
format = wxU(temp.c_str());
for (i = 0; i < tracks.size(); i++) { for (i = 0; i < tracks.size(); i++) {
if (!all && (!tracks[i]->enabled || tracks[i]->appending)) if (!all && (!tracks[i]->enabled || tracks[i]->appending))
continue; continue;
@ -566,8 +568,10 @@ wxString
create_append_mapping() { create_append_mapping() {
int i; int i;
wxString s, format; wxString s, format;
string temp;
format = wxT("%d:" LLD ":%d:" LLD); fix_format("%d:" LLD ":%d:" LLD, temp);
format = wxU(temp.c_str());
for (i = 1; i < tracks.size(); i++) { for (i = 1; i < tracks.size(); i++) {
if (!tracks[i]->enabled || !tracks[i]->appending) if (!tracks[i]->enabled || !tracks[i]->appending)
continue; continue;

6
src/mmg/tab_input.cpp
View File

@ -900,8 +900,10 @@ tab_input::add_file(const wxString &file_name,
dims = split(pair[1], wxU("x")); dims = split(pair[1], wxU("x"));
if ((dims.size() == 2) && parse_int(wxMB(dims[0]), width) && if ((dims.size() == 2) && parse_int(wxMB(dims[0]), width) &&
parse_int(wxMB(dims[1]), height)) { parse_int(wxMB(dims[1]), height)) {
track->dwidth.Printf(wxT(LLD), width); string format;
track->dheight.Printf(wxT(LLD), height); fix_format(LLD, format);
track->dwidth.Printf(wxU(format.c_str()), width);
track->dheight.Printf(wxU(format.c_str()), height);
track->display_dimensions_selected = true; track->display_dimensions_selected = true;
} }