| commit | b17bb4e2515c4c59f6ea6ec58db660d026c0ef04 | [log] [tgz] |
|---|---|---|
| author | Wei Jia <wjia@google.com> | Tue Jun 06 19:58:07 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Jun 06 19:58:07 2017 +0000 |
| tree | 365b7c9376d10a8643d1ef0f2bcf0781885222c0 | |
| parent | 1ce2364aa0b8115f91129983afda449fcabd46e9 [diff] | |
| parent | 529fc839a26f1b2a39eddc6ad37ab721915562d4 [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 Change-Id: Id7dfc412bb1bc9428528fd9ba6c6ab45f3242537