| commit | 63a4f82181744b6a6ca82226489a9138ef7823fb | [log] [tgz] |
|---|---|---|
| author | Wei Jia <wjia@google.com> | Wed May 25 19:02:28 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed May 25 19:02:28 2016 +0000 |
| tree | 78213b7a1b05589b45241f391a5e4dfd462174f0 | |
| parent | d64810330ba81c6eb9a17e9fcc67b05ab4c29560 [diff] | |
| parent | e83713c1987c929af2ed704e1a395a334606fad0 [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 * commit 'e83713c1987c929af2ed704e1a395a334606fad0': DO NOT MERGE MPEG4Extractor: ensure kKeyTrackID exists before creating an MPEG4Source as track. Change-Id: I683a737aa9379f46a5ffc3fdf33d1832942ffb38