mirror of
https://github.com/androidx/media.git
synced 2025-05-09 08:30:43 +08:00
Fix merge issue
This commit is contained in:
parent
18ab96349e
commit
776da10725
@ -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);
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user