From 40c77b3ca4e4f1ab48e6b1c4e055af7ffa80c3a8 Mon Sep 17 00:00:00 2001 From: Moritz Bunkus Date: Wed, 10 Nov 2004 21:31:56 +0000 Subject: [PATCH] Do not insist on having a default duration/fps for AVI compat mode video tracks. Video tracks muxed from MP4 don't have that and couldn't be remuxed otherwise. --- ChangeLog | 7 +++++++ src/input/r_matroska.cpp | 8 -------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1a3c675a3..3b30479cb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2004-11-10 Moritz Bunkus + + * mkvmerge: bug fix: The Matroska reader doesn't insist on having + a default duration ( = FPS) for video tracks in the "AVI + compatibility mode" ( = with the CodecID "V_MS/VFW/FOURCC"). This + enables re-muxing of Matroska files created from MP4 files. + 2004-11-05 Moritz Bunkus * mmg: bug fix: File names with non-ASCII characters were not diff --git a/src/input/r_matroska.cpp b/src/input/r_matroska.cpp index f21065ac7..de4ad1bd0 100644 --- a/src/input/r_matroska.cpp +++ b/src/input/r_matroska.cpp @@ -375,14 +375,6 @@ kax_reader_c::verify_tracks() { } memcpy(t->v_fourcc, &bih->bi_compression, 4); - - if (t->v_frate == 0.0) { - if (verbose) - mxwarn(PFX "(MS compatibility " - "mode, track %u) No VideoFrameRate/DefaultDuration " - "element was found.\n", t->tnum); - continue; - } } }