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