From 6b3af0f3e6ef2ec5a8d64e8fa829d4e5faabdb89 Mon Sep 17 00:00:00 2001 From: Moritz Bunkus Date: Wed, 2 Nov 2005 16:04:32 +0000 Subject: [PATCH] Only use a packet before it has been sent downstream with add_packet(). Fixes Anthill bug #160. --- ChangeLog | 6 ++++++ src/output/p_video.cpp | 5 +++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index b79abe07b..a26f56498 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2005-11-02 Moritz Bunkus + + * mkvmerge: bug fix: Fixed another bug when appending AVC/h.264 + tracks that would mkvmerge cause to die with "bref_packet == + NULL". Fixes Anthill bug #160. + 2005-11-01 Moritz Bunkus * mmg: bug fix: When the user saved the muxing output in a log diff --git a/src/output/p_video.cpp b/src/output/p_video.cpp index 1b5dedbf8..09da4e791 100644 --- a/src/output/p_video.cpp +++ b/src/output/p_video.cpp @@ -772,9 +772,10 @@ mpeg4_p10_video_packetizer_c::process(packet_cptr packet) { packet->bref = ref_timecode; } - add_packet(packet); - ref_timecode = packet->timecode; + add_packet(packet); + return FILE_STATUS_MOREDATA; } +