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