| commit | c3c67fef5d5d33f2784e61bccbf5e1efcd5e7c41 | [log] [tgz] |
|---|---|---|
| author | Wei Jia <wjia@google.com> | Tue Jun 06 20:09:34 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Jun 06 20:09:34 2017 +0000 |
| tree | 73266f70d6524de6be7fa5ef9fe43bb5c40faf26 | |
| parent | 414ff6e202a170c8f6922ac6dc5416dee26bf23b [diff] | |
| parent | 43d484ebe4e4b7a1a3d4cd10977c6ff4ee856d21 [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 am: 43d484ebe4 -s ours Change-Id: I4a90db67d4e2bc72a4794a286d741f3d9b820bdb