OSDN Git Service

Merge "DO NOT MERGE - m4v_h263: check header first before decoding a frame." into...
authorWei Jia <wjia@google.com>
Tue, 6 Jun 2017 18:59:39 +0000 (18:59 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 6 Jun 2017 18:59:39 +0000 (18:59 +0000)
commit486e62c5dd02865c194e599711cf55478c00bceb
tree8b7680cf16eac5079c70089c03ba95e93874ae03
parenteb21712f81aa9f6d5b055113595220ee1506f35c
parentf3383881ffde82b1b50d5a69b488006f289fd8b5
Merge "DO NOT MERGE - m4v_h263: check header first before decoding a frame." into klp-dev am: da924b45e1 am: fdfad5899d
am: f3383881ff  -s ours

Change-Id: Ida0671401c4323f61ff63c4954522171efa2bcca