OSDN Git Service

(root) / android-x86 / frameworks-av.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cbe7761 3d1df4f)
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)
am: 3d1df4f411  -s ours

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

Change-Id: Id6ce35c59190c3d94129e8ec4c1f2aef108fa71a


Trivial merge
frameworks/av
About OSDN
Find Software
Develop Software
Help