| commit | 43d484ebe4e4b7a1a3d4cd10977c6ff4ee856d21 | [log] [tgz] |
|---|---|---|
| author | Wei Jia <wjia@google.com> | Tue Jun 06 20:03:39 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Jun 06 20:03:39 2017 +0000 |
| tree | 2d77244f3a11fa654c00a0a6f556b851a7ab8453 | |
| parent | 83cf30ec83bccc27ca1204dc2afed54e2ca401cc [diff] | |
| parent | b17bb4e2515c4c59f6ea6ec58db660d026c0ef04 [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 am: 975e2275ce am: 529fc839a2 am: b17bb4e251 Change-Id: I1a6f3b3c4981eea28d8e98e7bfc6a0107370873f