| commit | c65002b096c4015e798a0ea685df0119c137b596 | [log] [tgz] |
|---|---|---|
| author | Wei Jia <wjia@google.com> | Wed May 25 19:06:44 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed May 25 19:06:44 2016 +0000 |
| tree | f261d27be496c788800ab41061cfb0f7d164a0c3 | |
| parent | 7b86b7519019ad27274a6069309db33ed05772fc [diff] | |
| parent | 63a4f82181744b6a6ca82226489a9138ef7823fb [diff] |
DO NOT MERGE MPEG4Extractor: ensure kKeyTrackID exists before creating an MPEG4Source as track. am: b016207fc2 am: e2ca751723 am: 3d1df4f411 -s ours am: 1ed4ec584b -s ours am: 4223af4708 am: e67ec85275 am: e83713c198 -s ours am: 63a4f82181 * commit '63a4f82181744b6a6ca82226489a9138ef7823fb': DO NOT MERGE MPEG4Extractor: ensure kKeyTrackID exists before creating an MPEG4Source as track. Change-Id: Ic0bc3de3df2e071ec21789d8b11e50afc562c482