commit | cfd9b9b85a7af2db0670ab98045558d35d530e16 | [log] [tgz] |
---|---|---|
author | Wei Jia <wjia@google.com> | Tue Jun 06 19:28:34 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Tue Jun 06 19:28:34 2017 +0000 |
tree | 174a46a8df333fd36ffc7e22d360dd9abb8e0abb | |
parent | 1248e62082d04ece6963ee421791650f0887be59 [diff] | |
parent | e138ca8b828157782db5b8c2a3c58cabc1a487ac [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 Change-Id: I5f55433da57c986167d638b4ea65edafb087b7b1