| commit | 0742dd1d9a6fab54c6f71ea7d44deb24d291adaa | [log] [tgz] |
|---|---|---|
| author | Abhishek Arya <aarya@google.com> | Thu Aug 20 01:16:19 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 20 01:16:19 2015 +0000 |
| tree | e52fd6596c70f3fffdb5f39fe183fbd5c340791b | |
| parent | 0cc0d158694b20f210ba4ad41fe4adc5bda57402 [diff] | |
| parent | cce066d61dd80549dd2f087fdb9299106ede59ce [diff] |
am cce066d6: am 3459ea26: am de47cd3c: am 3b77e940: am d146d466: am 6f561b93: Merge "MatroskaExtractor: detect infinite loop when parsing NALs" into klp-dev * commit 'cce066d61dd80549dd2f087fdb9299106ede59ce': MatroskaExtractor: detect infinite loop when parsing NALs