From 210efd48ed21ca0084d9440f9a1db7d9878f8094 Mon Sep 17 00:00:00 2001 From: Marco Nelissen Date: Wed, 29 May 2013 10:58:08 -0700 Subject: Don't crash if no timescale was given b/9175577 Change-Id: Ie159a9c9b42e6c8d9366d0ef6a607234af569e36 --- media/libstagefright/MPEG4Extractor.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'media/libstagefright/MPEG4Extractor.cpp') diff --git a/media/libstagefright/MPEG4Extractor.cpp b/media/libstagefright/MPEG4Extractor.cpp index 7697d55..919766c 100644 --- a/media/libstagefright/MPEG4Extractor.cpp +++ b/media/libstagefright/MPEG4Extractor.cpp @@ -921,6 +921,8 @@ status_t MPEG4Extractor::parseChunk(off64_t *offset, int depth) { if (entry_count != 1) { // we only support a single entry at the moment, for gapless playback ALOGW("ignoring edit list with %d entries", entry_count); + } else if (mLastTrack->timescale == 0) { + ALOGW("ignoring edit list because timescale is 0"); } else { off64_t entriesoffset = data_offset + 8; uint64_t segment_duration; -- cgit v1.1