From eb877f0cb7013ecd646899f84b2055ede971d853 Mon Sep 17 00:00:00 2001 From: andrewlewis Date: Mon, 11 Apr 2016 08:21:23 -0700 Subject: [PATCH] Handle udta as a leaf atom. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=119532634 --- .../google/android/exoplayer/extractor/mp4/Mp4Extractor.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/library/src/main/java/com/google/android/exoplayer/extractor/mp4/Mp4Extractor.java b/library/src/main/java/com/google/android/exoplayer/extractor/mp4/Mp4Extractor.java index 1551dfe667..4e1bf762f5 100644 --- a/library/src/main/java/com/google/android/exoplayer/extractor/mp4/Mp4Extractor.java +++ b/library/src/main/java/com/google/android/exoplayer/extractor/mp4/Mp4Extractor.java @@ -456,7 +456,7 @@ public final class Mp4Extractor implements Extractor, SeekMap { || atom == Atom.TYPE_stsd || atom == Atom.TYPE_stts || atom == Atom.TYPE_stss || atom == Atom.TYPE_ctts || atom == Atom.TYPE_elst || atom == Atom.TYPE_stsc || atom == Atom.TYPE_stsz || atom == Atom.TYPE_stco || atom == Atom.TYPE_co64 - || atom == Atom.TYPE_tkhd || atom == Atom.TYPE_ftyp || atom == Atom.TYPE_meta; + || atom == Atom.TYPE_tkhd || atom == Atom.TYPE_ftyp || atom == Atom.TYPE_udta; } /** @@ -464,8 +464,7 @@ public final class Mp4Extractor implements Extractor, SeekMap { */ private static boolean shouldParseContainerAtom(int atom) { return atom == Atom.TYPE_moov || atom == Atom.TYPE_trak || atom == Atom.TYPE_mdia - || atom == Atom.TYPE_minf || atom == Atom.TYPE_stbl || atom == Atom.TYPE_edts - || atom == Atom.TYPE_udta; + || atom == Atom.TYPE_minf || atom == Atom.TYPE_stbl || atom == Atom.TYPE_edts; } private static final class Mp4Track {