commit | 975e2275cec62c04dfc34f65852c3cf4d1dcee48 | [log] [tgz] |
---|---|---|
author | Wei Jia <wjia@google.com> | Tue Jun 06 19:46:38 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Tue Jun 06 19:46:38 2017 +0000 |
tree | 78a3f2df93bf4cc9a1345d64595cb7cfea53f409 | |
parent | 87e076681bbf79ae6dd6471cca8cb5661e3f0cc0 [diff] | |
parent | 2ab8c23b514e4af84199449f5fd101f96b706705 [diff] |
Merge "DO NOT MERGE - m4v_h263: check header first before decoding a frame." into klp-dev am: da924b45e1 am: fdfad5899d am: f3383881ff -s ours am: 486e62c5dd -s ours am: 98a5397265 am: bb3d5445c9 -s ours am: 16531bf687 am: e138ca8b82 am: cfd9b9b85a am: 2a930213ed -s ours am: 2ab8c23b51 Change-Id: Ic46214006dcfeb257c400b2d4acfb0d87fd86786