commit | 4223af4708e4524375385efe13f7ddebfd71ffcf | [log] [tgz] |
---|---|---|
author | Wei Jia <wjia@google.com> | Wed May 25 18:49:32 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Wed May 25 18:49:32 2016 +0000 |
tree | 8ba862ff53608e0b36b7ae8d54125ca077dc000e | |
parent | 61a1371ea195495c4bf2fe30812cce9275674c08 [diff] | |
parent | 1ed4ec584b736febb95e5fe390bfc1ffea039b99 [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 * commit '1ed4ec584b736febb95e5fe390bfc1ffea039b99': DO NOT MERGE MPEG4Extractor: ensure kKeyTrackID exists before creating an MPEG4Source as track. Change-Id: Ia777e26e03f925fff45db6a4556c05758923a94c