OSDN Git Service

DO NOT MERGE MPEG4Extractor: ensure kKeyTrackID exists before creating an MPEG4Source...
authorWei Jia <wjia@google.com>
Wed, 25 May 2016 18:45:07 +0000 (18:45 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 25 May 2016 18:45:07 +0000 (18:45 +0000)
commit1ed4ec584b736febb95e5fe390bfc1ffea039b99
tree5cbca8835b3e060748db10f0c44bdfb72edb5fc3
parentcbe776167a52a43f6acbafd3278e662840a256c2
parent3d1df4f411a531fb30cc8563cb39e732041d22ad
DO NOT MERGE MPEG4Extractor: ensure kKeyTrackID exists before creating an MPEG4Source as track. am: b016207fc2 am: e2ca751723
am: 3d1df4f411  -s ours

* commit '3d1df4f411a531fb30cc8563cb39e732041d22ad':
  DO NOT MERGE MPEG4Extractor: ensure kKeyTrackID exists before creating an MPEG4Source as track.

Change-Id: Id6ce35c59190c3d94129e8ec4c1f2aef108fa71a