From 08e457eaaf43d74c7bab21cb4dda46f847bd9863 Mon Sep 17 00:00:00 2001 From: Moritz Bunkus Date: Thu, 7 Apr 2005 15:17:17 +0000 Subject: [PATCH] Do not use the FPS field of RealMedia files for the default duration of RealVideo tracks. It may contain the maximum number of frames per second that the encoder should output or has output. Fixes Anthill bug 113. --- ChangeLog | 7 +++++++ src/input/r_real.cpp | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index d4ab5e76c..962fd5df8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2005-04-07 Moritz Bunkus + * mkvmerge: bug fix: RealMedia files contain a "FPS" field in + their track headers. Unfortunately this field does not always + contain the actual FPS of a video track but the maximum number of + FPS that the encoder has output or should output. Therefore + mkvmerge does not use a "default duration" element for RealVideo + tracks anymore. Fixes Anthill bug 113. + * mkvmerge: bug fix: Failing calls to posix_fadvise upon adding a file to mmg caused mmg to think that the file identification failed. Now warnings for posix_fadvise are not output anymore, and diff --git a/src/input/r_real.cpp b/src/input/r_real.cpp index 66ae6bfb8..8082f1f84 100644 --- a/src/input/r_real.cpp +++ b/src/input/r_real.cpp @@ -326,7 +326,7 @@ real_reader_c::create_packetizer(int64_t tid) { mxprints(buffer, "V_REAL/%s", dmx->fourcc); dmx->ptzr = - add_packetizer(new video_packetizer_c(this, buffer, dmx->fps, + add_packetizer(new video_packetizer_c(this, buffer, 0.0, dmx->width, dmx->height, ti)); if ((dmx->fourcc[0] != 'R') || (dmx->fourcc[1] != 'V') || (dmx->fourcc[2] != '4') || (dmx->fourcc[3] != '0'))