From 315f9c8cc80c99081650610581b56c5759e31f63 Mon Sep 17 00:00:00 2001 From: Moritz Bunkus Date: Sun, 12 Nov 2006 16:13:20 +0000 Subject: [PATCH] If the CTTS atom is missing/empty then do not try to access the frame offset table. --- ChangeLog | 4 ++++ src/input/r_qtmp4.cpp | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 65fa43f85..4722885a5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2006-11-12 Moritz Bunkus + * mkvmerge: bug fix: Quicktime/MP4 files with AVC video tracks and + missing CTTS atoms caused mkvmerge to crash after the recent + changes to the Quicktime/MP4 timecode handling. + * mkvmerge: bug fix: Fixed a segfault if the file specified with "--attach-file" does not exist. Bugfix for Anthill bug 213 and Debian bug 393984. diff --git a/src/input/r_qtmp4.cpp b/src/input/r_qtmp4.cpp index c4755c96e..ee516bf2f 100644 --- a/src/input/r_qtmp4.cpp +++ b/src/input/r_qtmp4.cpp @@ -1810,7 +1810,7 @@ qtmp4_demuxer_t::calculate_timecodes() { int64_t v_dts_offset = 0; vector timecodes_before_offsets; - if (('v' == type) && v_is_avc) + if (('v' == type) && v_is_avc && !frame_offset_table.empty()) v_dts_offset = to_nsecs(frame_offset_table[0]); for (frame = 0; sample_table.size() > frame; ++frame) {