| commit | a2ebcc043f9b04f08f89fc6281199a34e43d4cae | [log] [tgz] |
|---|---|---|
| author | Wei Jia <wjia@google.com> | Wed May 25 19:20:17 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed May 25 19:20:17 2016 +0000 |
| tree | 2b78730869fa0bb0c0b12d85d914f8af28280268 | |
| parent | 5d8e3808b4012fa72bedf5898803682831f88e84 [diff] | |
| parent | 02d1d044981b6a28d18a72d7a897f50f446c3a80 [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 am: c65002b096 am: 28561389e9 am: 02d1d04498 -s ours * commit '02d1d044981b6a28d18a72d7a897f50f446c3a80': DO NOT MERGE MPEG4Extractor: ensure kKeyTrackID exists before creating an MPEG4Source as track. Change-Id: I89f1f38e5db15e35a5d14cce11e9dd94a52c2677