1. d4f0d88 resolved conflicts for merge of eb10ccbc to lmp-dev by Marco Nelissen · 11 years ago
  2. eb10ccb resolved conflicts for merge of 8a064aa8 to klp-modular-dev by Marco Nelissen · 11 years ago
  3. ef87594 Merge "libstagefright: Fix crash in convertMetaDataToMessage" into lmp-dev by Nick Kralevich · 11 years ago
  4. 8a064aa Merge "Fail more gracefully on allocation failure" into klp-dev by Marco Nelissen · 11 years ago
  5. b53cdf4 am d7c205fe: am 522019f1: Merge "libstagefright: fix handling of mSampleTimeEntries and mNumSampleSizes in SampleTable." into klp-dev by Wei Jia · 11 years ago
  6. 2fd79fa am cb2acbfe: am 635d38a8: Merge "Check RTSP payload length" into klp-dev by Abhishek Arya · 11 years ago
  7. 8a55bcb resolved conflicts for merge of ced2dd3c to lmp-dev by Marco Nelissen · 11 years ago
  8. d7c205f am 522019f1: Merge "libstagefright: fix handling of mSampleTimeEntries and mNumSampleSizes in SampleTable." into klp-dev by Wei Jia · 11 years ago
  9. cb2acbf am 635d38a8: Merge "Check RTSP payload length" into klp-dev by Abhishek Arya · 11 years ago
  10. ced2dd3 am 2c880dde: Merge "Sanity check padding/delay values for gapless playback" into klp-dev by Abhishek Arya · 11 years ago
  11. 2562495 am a590baca: Merge commit \'6ae815e0\' into HEAD by Wei Jia · 11 years ago
  12. a590bac Merge commit '6ae815e0' into HEAD by Wei Jia · 11 years ago
  13. 522019f Merge "libstagefright: fix handling of mSampleTimeEntries and mNumSampleSizes in SampleTable." into klp-dev by Wei Jia · 11 years ago
  14. 4b995f7 Merge "libstagefright: fix handling of mSampleTimeEntries and mNumSampleSizes in SampleTable." into lmp-dev by Wei Jia · 11 years ago
  15. a9b3cd3 am 5221133b: am b2ae4351: libstagefright: fix overflow in pvdec_api.cpp. by Wei Jia · 11 years ago
  16. 635d38a Merge "Check RTSP payload length" into klp-dev by Abhishek Arya · 11 years ago
  17. 2c880dd Merge "Sanity check padding/delay values for gapless playback" into klp-dev by Abhishek Arya · 11 years ago
  18. 5221133 am b2ae4351: libstagefright: fix overflow in pvdec_api.cpp. by Wei Jia · 11 years ago
  19. 6ae815e Merge "libstagefright: fix overflow in MPEG4Source::parseSampleAuxiliaryInformationOffsets." into klp-dev by Wei Jia · 11 years ago
  20. 937c6be libstagefright: fix overflow in MPEG4Source::parseSampleAuxiliaryInformationOffsets. by Wei Jia · 11 years ago
  21. b2ae435 libstagefright: fix overflow in pvdec_api.cpp. by Wei Jia · 11 years ago
  22. 4d46f6f Check RTSP payload length by Marco Nelissen · 11 years ago
  23. 4bce636 libstagefright: Fix crash in convertMetaDataToMessage by Wei Jia · 11 years ago
  24. 5a13259 libstagefright: fix handling of mSampleTimeEntries and mNumSampleSizes in SampleTable. by Wei Jia · 11 years ago
  25. 108cd2d libstagefright: fix handling of mSampleTimeEntries and mNumSampleSizes in SampleTable. by Wei Jia · 11 years ago
  26. 3878b99 Fail more gracefully on allocation failure by Marco Nelissen · 12 years ago
  27. fd5942b am 6b52d191: (-s ours) am 916a9684: Merge "DO NOT MERGE - audio flinger: fix fuzz test crash" into klp-dev by Eric Laurent · 11 years ago
  28. 6b52d19 am 916a9684: Merge "DO NOT MERGE - audio flinger: fix fuzz test crash" into klp-dev by Eric Laurent · 11 years ago
  29. bdb5e49 Merge "DO NOT MERGE - audio flinger: fix fuzz test crash" into lmp-dev by Eric Laurent · 11 years ago
  30. 916a968 Merge "DO NOT MERGE - audio flinger: fix fuzz test crash" into klp-dev by Eric Laurent · 11 years ago
  31. b97ee93 DO NOT MERGE - audio flinger: fix fuzz test crash by Eric Laurent · 11 years ago
  32. 4ce86e7 am 5d7a381b: am 877c76ac: Merge "stagefright: check IMemory::pointer() before using the allocation" into klp-dev by Chong Zhang · 11 years ago
  33. 8a1a5d1 am 9707195b: am f97b6bee: Merge "Check integer overflow to prevent memory corruption" into klp-dev by Jon Larimer · 11 years ago
  34. 698ff79 am 27362395: (-s ours) am 2ed42aea: Merge "do not dequeue from native window after we hit fatal error -- DO NOT MERGE" into klp-dev by Jon Larimer · 11 years ago
  35. 5d7a381 am 877c76ac: Merge "stagefright: check IMemory::pointer() before using the allocation" into klp-dev by Chong Zhang · 11 years ago
  36. 2f3c04a resolved conflicts for merge of 6035c811 to lmp-dev by Nick Kralevich · 11 years ago
  37. 877c76a Merge "stagefright: check IMemory::pointer() before using the allocation" into klp-dev by Chong Zhang · 11 years ago
  38. ba6093a Sanity check padding/delay values for gapless playback by Marco Nelissen · 11 years ago
  39. a1e462e am 0afecdeb: am aa1cc741: Merge "Check buffer size before using it" into klp-dev by Jon Larimer · 11 years ago
  40. 5ff4bb7 am 8026ad38: am 6efa86be: Merge "Check vector size before accessing" into klp-dev by Abhishek Arya · 11 years ago
  41. 3b77e94 am d146d466: am 6f561b93: Merge "MatroskaExtractor: detect infinite loop when parsing NALs" into klp-dev by Abhishek Arya · 11 years ago
  42. e9a8362 am a2a68264: am c37f7f6f: Fix for memory corruption in ID3::removeUnsynchronizationV2_4(). Bug: 23227354 by Neel Mehta · 11 years ago
  43. 6afd857 am 073a656d: am deba0610: Merge "Revert "Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4"" into klp-dev by Abhishek Arya · 11 years ago
  44. 01841c7 am af46239a: am 9abb7401: Fix compile failure after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4 by Abhishek Arya · 11 years ago
  45. de5c4c4 am 43131299: am 1a09d352: Merge "libstagefright: check remaining data size before parsing it." into klp-dev by Wei Jia · 11 years ago
  46. 9359e82 am 8a34499a: am c23e3dd8: Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4 by Abhishek Arya · 11 years ago
  47. d3b0f86 am ce380290: (-s ours) am 567b6551: Merge "SoftAVCEnc: check requested memory size before allocation." into klp-dev by Wei Jia · 11 years ago
  48. 9707195 am f97b6bee: Merge "Check integer overflow to prevent memory corruption" into klp-dev by Jon Larimer · 11 years ago
  49. 2736239 am 2ed42aea: Merge "do not dequeue from native window after we hit fatal error -- DO NOT MERGE" into klp-dev by Jon Larimer · 11 years ago
  50. f97b6be Merge "Check integer overflow to prevent memory corruption" into klp-dev by Jon Larimer · 11 years ago
  51. 5b4a5cc Merge "do not dequeue from native window after we hit fatal error -- DO NOT MERGE" into lmp-dev by Jon Larimer · 11 years ago
  52. 2ed42ae Merge "do not dequeue from native window after we hit fatal error -- DO NOT MERGE" into klp-dev by Jon Larimer · 11 years ago
  53. f1a93e4 Merge "SoftOpus: Fix output buffer capacity." into lmp-dev by Jon Larimer · 11 years ago
  54. 6035c81 am 0d46c937: Merge "MPEG4Source::fragmentedRead: check range before writing into buffers" into klp-dev by Jon Larimer · 11 years ago
  55. 0afecde am aa1cc741: Merge "Check buffer size before using it" into klp-dev by Jon Larimer · 11 years ago
  56. 0d46c93 Merge "MPEG4Source::fragmentedRead: check range before writing into buffers" into klp-dev by Jon Larimer · 11 years ago
  57. aa1cc74 Merge "Check buffer size before using it" into klp-dev by Jon Larimer · 11 years ago
  58. 8026ad3 am 6efa86be: Merge "Check vector size before accessing" into klp-dev by Abhishek Arya · 11 years ago
  59. d146d46 am 6f561b93: Merge "MatroskaExtractor: detect infinite loop when parsing NALs" into klp-dev by Abhishek Arya · 11 years ago
  60. a2a6826 am c37f7f6f: Fix for memory corruption in ID3::removeUnsynchronizationV2_4(). Bug: 23227354 by Neel Mehta · 11 years ago
  61. 6efa86b Merge "Check vector size before accessing" into klp-dev by Abhishek Arya · 11 years ago
  62. 6f561b9 Merge "MatroskaExtractor: detect infinite loop when parsing NALs" into klp-dev by Abhishek Arya · 11 years ago
  63. 3323598 am 09c29ec4: am 94c1969c: Merge "libstagefright: check memory size for overflow before allocation." into klp-dev by Abhishek Arya · 11 years ago
  64. 45e493e Merge "Merge commit '5a289b87' into HEAD" into lmp-dev by Wei Jia · 11 years ago
  65. 407d475 MatroskaExtractor: detect infinite loop when parsing NALs by Robert Shih · 11 years ago
  66. 9cebcc5 Merge "SoftAVCEncoder: fix mismatched type for comparison." into lmp-dev by Wei Jia · 11 years ago
  67. dd7c0dd Merge commit '5a289b87' into HEAD by Wei Jia · 11 years ago
  68. c37f7f6 Fix for memory corruption in ID3::removeUnsynchronizationV2_4(). Bug: 23227354 by Neel Mehta · 11 years ago
  69. 38eff9a SoftAVCEncoder: fix mismatched type for comparison. by Wei Jia · 11 years ago
  70. 7d113a2 am 6d59c11c: (-s ours) am fc8c226b: Merge "Revert "SoftAVCEnc: check requested memory size before allocation."" into klp-dev by Wei Jia · 11 years ago
  71. 073a656 am deba0610: Merge "Revert "Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4"" into klp-dev by Abhishek Arya · 11 years ago
  72. af46239 am 9abb7401: Fix compile failure after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4 by Abhishek Arya · 11 years ago
  73. 90eee33 am 652926c8: am 74d3170f: Merge "Fix comparison sign warnings." into klp-dev by Wei Jia · 11 years ago
  74. deba061 Merge "Revert "Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4"" into klp-dev by Abhishek Arya · 11 years ago
  75. 9abb740 Fix compile failure after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4 by Abhishek Arya · 11 years ago
  76. 22ac20e DO NOT MERGE - audio flinger: fix fuzz test crash by Eric Laurent · 11 years ago
  77. 65842db Merge commit 'b46eb8d9' into HEAD by Wei Jia · 11 years ago
  78. 4313129 am 1a09d352: Merge "libstagefright: check remaining data size before parsing it." into klp-dev by Wei Jia · 11 years ago
  79. 8a34499 am c23e3dd8: Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4 by Abhishek Arya · 11 years ago
  80. ce38029 am 567b6551: Merge "SoftAVCEnc: check requested memory size before allocation." into klp-dev by Wei Jia · 11 years ago
  81. 09c29ec am 94c1969c: Merge "libstagefright: check memory size for overflow before allocation." into klp-dev by Abhishek Arya · 11 years ago
  82. 5a289b8 am 120f259d: Merge "ABuffer: reset members when memory allocation fails." into klp-dev by Wei Jia · 11 years ago
  83. 6d59c11 am fc8c226b: Merge "Revert "SoftAVCEnc: check requested memory size before allocation."" into klp-dev by Wei Jia · 11 years ago
  84. 652926c am 74d3170f: Merge "Fix comparison sign warnings." into klp-dev by Wei Jia · 11 years ago
  85. b46eb8d am 479b4de0: SoftAVCEnc: check requested memory size before allocation. by Wei Jia · 11 years ago
  86. 1a09d35 Merge "libstagefright: check remaining data size before parsing it." into klp-dev by Wei Jia · 11 years ago
  87. 12bd1d2 Revert "Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4" by Abhishek Arya · 11 years ago
  88. f810a82 MPEG4Source::fragmentedRead: check range before writing into buffers by Robert Shih · 11 years ago
  89. c23e3dd Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4 by Abhishek Arya · 11 years ago
  90. 567b655 Merge "SoftAVCEnc: check requested memory size before allocation." into klp-dev by Wei Jia · 11 years ago
  91. 94c1969 Merge "libstagefright: check memory size for overflow before allocation." into klp-dev by Abhishek Arya · 11 years ago
  92. 8ec845c stagefright: check IMemory::pointer() before using the allocation by Chong Zhang · 11 years ago
  93. bf47eb9 do not dequeue from native window after we hit fatal error -- DO NOT MERGE by Chong Zhang · 11 years ago
  94. 734e65e do not dequeue from native window after we hit fatal error -- DO NOT MERGE by Chong Zhang · 11 years ago
  95. d2ebc0b libstagefright: check remaining data size before parsing it. by Wei Jia · 11 years ago
  96. 3fd9668 SoftAVCEnc: check requested memory size before allocation. by Wei Jia · 11 years ago
  97. 120f259 Merge "ABuffer: reset members when memory allocation fails." into klp-dev by Wei Jia · 11 years ago
  98. fc8c226 Merge "Revert "SoftAVCEnc: check requested memory size before allocation."" into klp-dev by Wei Jia · 11 years ago
  99. 98e68e8 Revert "SoftAVCEnc: check requested memory size before allocation." by Wei Jia · 11 years ago
  100. 74d3170 Merge "Fix comparison sign warnings." into klp-dev by Wei Jia · 11 years ago