| commit | 4005367e8d1ccb910c7d02bcaaf4d96253df2ed5 | [log] [tgz] |
|---|---|---|
| author | Robert Shih <robertshih@google.com> | Mon Jul 20 23:54:55 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 20 23:54:55 2015 +0000 |
| tree | c9516704e063100363f0438fb46afcee6d624d43 | |
| parent | c639f06eb6ae7f887ed1f1597aa218b6b90b6315 [diff] | |
| parent | 84e4987ffc8d4bb6731bcb28d69a7ff37a0e9921 [diff] |
am 84e4987f: Merge "MatroskaExtractor: detect infinite loop when parsing NALs" into mnc-dev * commit '84e4987ffc8d4bb6731bcb28d69a7ff37a0e9921': MatroskaExtractor: detect infinite loop when parsing NALs