From 9cbc0f4e5656f8b657548e4d551e178fbff9815f Mon Sep 17 00:00:00 2001 From: Moritz Bunkus Date: Thu, 15 Sep 2005 20:15:53 +0000 Subject: [PATCH] 0 means no duration which is the case for Real Media files. -1 means calculate the duration from the FPS which RM files do not really have. --- ChangeLog | 5 +++++ src/input/r_real.cpp | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 1bc57cff2..f46e73a80 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-09-15 Moritz Bunkus + + * mkvmerge: bug fix: Appending files with RealVideo was + broken. + 2005-09-09 Moritz Bunkus * mkvmerge, mkvextract: bug fix: ASS files sometimes use a column diff --git a/src/input/r_real.cpp b/src/input/r_real.cpp index 29542d762..9fa91421d 100644 --- a/src/input/r_real.cpp +++ b/src/input/r_real.cpp @@ -688,7 +688,7 @@ real_reader_c::assemble_video_packet(real_demuxer_t *dmx, set_dimensions(dmx, assembled->data, assembled->size); packet_t *packet = new packet_t(new memory_c(assembled->data, assembled->size, true), - (int64_t)assembled->timecode * 1000000, -1, + (int64_t)assembled->timecode * 1000000, 0, (assembled->flags & RMFF_FRAME_FLAG_KEYFRAME) == RMFF_FRAME_FLAG_KEYFRAME ? VFT_IFRAME : VFT_PFRAMEAUTOMATIC, VFT_NOBFRAME);