Fix merge issue

776da107 · Alan Snyder · 18ab9634 · 776da107
Commit 776da107 authored Sep 05, 2016 by Alan Snyder
Showing with 1 additions and 2 deletions
library/src/main/java/com/google/android/exoplayer2/extractor/mp4/AtomParsers.java
--- a/library/src/main/java/com/google/android/exoplayer2/extractor/mp4/AtomParsers.java
+++ b/library/src/main/java/com/google/android/exoplayer2/extractor/mp4/AtomParsers.java
@@ -414,8 +414,7 @@ import java.util.List;
      if (atomType == Atom.TYPE_meta) {
        udtaData.setPosition(udtaData.getPosition() - Atom.HEADER_SIZE);
        udtaData.setLimit(udtaData.getPosition() + atomSize);
-        parseMetaAtom(udtaData);
+        return parseMetaAtom(udtaData);
-        break;
      }
      udtaData.skipBytes(atomSize - Atom.HEADER_SIZE);
    }