diff options
| author | Marco Nelissen <marcone@google.com> | 2013-05-29 10:58:08 -0700 |
|---|---|---|
| committer | Marco Nelissen <marcone@google.com> | 2013-05-29 10:58:08 -0700 |
| commit | 210efd48ed21ca0084d9440f9a1db7d9878f8094 (patch) | |
| tree | 4d31adadea86767d2e33041c875e02a3f952444a /media | |
| parent | 4d2dd5577a7f1c5d485b66a95599c230952c191f (diff) | |
| download | frameworks_av-210efd48ed21ca0084d9440f9a1db7d9878f8094.zip frameworks_av-210efd48ed21ca0084d9440f9a1db7d9878f8094.tar.gz frameworks_av-210efd48ed21ca0084d9440f9a1db7d9878f8094.tar.bz2 | |
Don't crash if no timescale was given
b/9175577
Change-Id: Ie159a9c9b42e6c8d9366d0ef6a607234af569e36
Diffstat (limited to 'media')
| -rw-r--r-- | media/libstagefright/MPEG4Extractor.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
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; |