From 776da107251e2e51f12d23986b7e83a2c39a2bdd Mon Sep 17 00:00:00 2001
From: Alan Snyder <ranchlens@cbfiddle.com>
Date: Mon, 5 Sep 2016 15:39:40 -0700
Subject: [PATCH] Fix merge issue

---
 .../google/android/exoplayer2/extractor/mp4/AtomParsers.java   | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git 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
index cfa56ba3da..62dd11876f 100644
--- 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);
-        break;
+        return parseMetaAtom(udtaData);
       }
       udtaData.skipBytes(atomSize - Atom.HEADER_SIZE);
     }