| Index: media/formats/mp4/box_definitions.cc
|
| diff --git a/media/formats/mp4/box_definitions.cc b/media/formats/mp4/box_definitions.cc
|
| index b5e9f86119f67158d83a44915c79bc860a2bc500..fba3c941b7da74dbb96da5dc4a96c68af10fd7f8 100644
|
| --- a/media/formats/mp4/box_definitions.cc
|
| +++ b/media/formats/mp4/box_definitions.cc
|
| @@ -1204,14 +1204,13 @@ TrackFragment::~TrackFragment() {}
|
| FourCC TrackFragment::BoxType() const { return FOURCC_TRAF; }
|
|
|
| bool TrackFragment::Parse(BoxReader* reader) {
|
| - RCHECK(reader->ScanChildren() &&
|
| - reader->ReadChild(&header) &&
|
| + RCHECK(reader->ScanChildren() && reader->ReadChild(&header) &&
|
| // Media Source specific: 'tfdt' required
|
| - reader->ReadChild(&decode_time) &&
|
| - reader->MaybeReadChildren(&runs) &&
|
| + reader->ReadChild(&decode_time) && reader->MaybeReadChildren(&runs) &&
|
| reader->MaybeReadChild(&auxiliary_offset) &&
|
| reader->MaybeReadChild(&auxiliary_size) &&
|
| - reader->MaybeReadChild(&sdtp));
|
| + reader->MaybeReadChild(&sdtp) &&
|
| + reader->MaybeReadChild(&sample_encryption));
|
|
|
| // There could be multiple SampleGroupDescription and SampleToGroup boxes with
|
| // different grouping types. For common encryption, the relevant grouping type
|
|
|