loliball/media
1
0
Fork 0
mirror of https://github.com/androidx/media.git synced 2025-05-10 00:59:51 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix merge issue

Browse Source
This commit is contained in:
Alan Snyder 2016-09-05 15:39:40 -07:00
parent 18ab96349e
commit 776da10725
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
library/src/main/java/com/google/android/exoplayer2/extractor/mp4/AtomParsers.java
View File

@ -414,8 +414,7 @@ import java.util.List;
if (atomType == Atom.TYPE_meta) { if (atomType == Atom.TYPE_meta) {
udtaData.setPosition(udtaData.getPosition() - Atom.HEADER_SIZE); udtaData.setPosition(udtaData.getPosition() - Atom.HEADER_SIZE);
udtaData.setLimit(udtaData.getPosition() + atomSize); udtaData.setLimit(udtaData.getPosition() + atomSize);
parseMetaAtom(udtaData); return parseMetaAtom(udtaData);
break;
} }
udtaData.skipBytes(atomSize - Atom.HEADER_SIZE); udtaData.skipBytes(atomSize - Atom.HEADER_SIZE);
} }