| commit | cce066d61dd80549dd2f087fdb9299106ede59ce | [log] [tgz] |
|---|---|---|
| author | Abhishek Arya <aarya@google.com> | Tue Aug 18 16:51:14 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Aug 18 16:51:14 2015 +0000 |
| tree | e3a2955f9811e59b1be09602f91f75bcd1d8f75c | |
| parent | 06682f94d84f97df0d826f9b15d4c2e861ba4045 [diff] | |
| parent | 3459ea265ab8c61cca1b2ed97162fe3c3d05a698 [diff] |
am 3459ea26: am de47cd3c: am 3b77e940: am d146d466: am 6f561b93: Merge "MatroskaExtractor: detect infinite loop when parsing NALs" into klp-dev * commit '3459ea265ab8c61cca1b2ed97162fe3c3d05a698': MatroskaExtractor: detect infinite loop when parsing NALs