| commit | 3b77e940822e8a5ef4953b709bdae00fa1bcca43 | [log] [tgz] |
|---|---|---|
| author | Abhishek Arya <aarya@google.com> | Tue Aug 18 16:33:49 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Aug 18 16:33:49 2015 +0000 |
| tree | 3eafd348c58b70c0e73b752a345877d8956fe999 | |
| parent | e9a8362e1d379e90655e904ca49d6333e4218eda [diff] | |
| parent | d146d4660451fb04c039f4ac8554103876fa4722 [diff] |
am d146d466: am 6f561b93: Merge "MatroskaExtractor: detect infinite loop when parsing NALs" into klp-dev * commit 'd146d4660451fb04c039f4ac8554103876fa4722': MatroskaExtractor: detect infinite loop when parsing NALs