sjs/media
1
0
Fork 0
mirror of https://github.com/samsonjs/media.git synced 2026-04-01 10:35:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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) {
udtaData.setPosition(udtaData.getPosition() - Atom.HEADER_SIZE);
udtaData.setLimit(udtaData.getPosition() + atomSize);
parseMetaAtom(udtaData);
break;
return parseMetaAtom(udtaData);
}
udtaData.skipBytes(atomSize - Atom.HEADER_SIZE);
}