1. 199f36c resolve merge conflicts of 79cf158c51 to mnc-dev am: 50358a80b1 am: 86d5e962ce am: 24058e96b3 by Marco Nelissen · 8 years ago
  2. c9d4267 resolve merge conflicts of 79cf158c51 to mnc-dev am: 50358a80b1 am: 86d5e962ce by Marco Nelissen · 8 years ago
  3. 24058e9 resolve merge conflicts of 79cf158c51 to mnc-dev am: 50358a80b1 am: 86d5e962ce by Marco Nelissen · 8 years ago
  4. 86d5e96 resolve merge conflicts of 79cf158c51 to mnc-dev am: 50358a80b1 by Marco Nelissen · 8 years ago
  5. 50358a8 resolve merge conflicts of 79cf158c51 to mnc-dev by Marco Nelissen · 8 years ago
  6. 79cf158 Merge "stagefright: parseApp check data boundary conditions" into klp-dev am: 65433ff04d am: 86bd734f58 am: 7902138f2e am: a23c9a47ab by Marco Nelissen · 8 years ago
  7. f8a2e81 Merge "stagefright: parseApp check data boundary conditions" into klp-dev am: 65433ff04d am: 86bd734f58 am: 7902138f2e by Marco Nelissen · 8 years ago
  8. a23c9a4 Merge "stagefright: parseApp check data boundary conditions" into klp-dev am: 65433ff04d am: 86bd734f58 by Marco Nelissen · 8 years ago
  9. 7902138 Merge "stagefright: parseApp check data boundary conditions" into klp-dev am: 65433ff04d by Marco Nelissen · 8 years ago
  10. 86bd734 Merge "stagefright: parseApp check data boundary conditions" into klp-dev by Marco Nelissen · 8 years ago
  11. 65433ff Merge "stagefright: parseApp check data boundary conditions" into klp-dev by Marco Nelissen · 8 years ago
  12. d51a9b5 Merge "Turn off overflow protection for various math functions" into nyc-dev by Marco Nelissen · 9 years ago
  13. d373dd0 Merge "CameraBase: Don't return an sp<> by reference" into klp-dev am: fdf64bab96 am: 4fca12e56f am: f0009384d8 am: 7a14d95270 am: 888f5bab6d am: a6b1816e16 am: 06f46cabd0 am: 31670090bf am: e1b8152064 by Eino-Ville Talvala · 9 years ago
  14. 92d2d4c CameraBase: Don't return an sp<> by reference am: 4b49489c12 am: 8c32699ceb am: 8806c2a11d am: 99c4dd2fe8 am: dd82ab2377 am: 1dd068cd45 am: edf9d2f4d1 am: 6ddd08e3a9 am: 0dcc9bb368 by Eino-Ville Talvala · 9 years ago
  15. dd062f9 Merge "CameraBase: Don't return an sp<> by reference" into klp-dev am: fdf64bab96 am: 4fca12e56f am: f0009384d8 am: 7a14d95270 am: 888f5bab6d am: a6b1816e16 am: 06f46cabd0 am: 31670090bf by Eino-Ville Talvala · 9 years ago
  16. b739918 CameraBase: Don't return an sp<> by reference am: 4b49489c12 am: 8c32699ceb am: 8806c2a11d am: 99c4dd2fe8 am: dd82ab2377 am: 1dd068cd45 am: edf9d2f4d1 am: 6ddd08e3a9 by Eino-Ville Talvala · 9 years ago
  17. e1b8152 Merge "CameraBase: Don't return an sp<> by reference" into klp-dev am: fdf64bab96 am: 4fca12e56f am: f0009384d8 am: 7a14d95270 am: 888f5bab6d am: a6b1816e16 am: 06f46cabd0 by Eino-Ville Talvala · 9 years ago
  18. 0dcc9bb CameraBase: Don't return an sp<> by reference am: 4b49489c12 am: 8c32699ceb am: 8806c2a11d am: 99c4dd2fe8 am: dd82ab2377 am: 1dd068cd45 am: edf9d2f4d1 by Eino-Ville Talvala · 9 years ago
  19. 3167009 Merge "CameraBase: Don't return an sp<> by reference" into klp-dev am: fdf64bab96 am: 4fca12e56f am: f0009384d8 am: 7a14d95270 am: 888f5bab6d am: a6b1816e16 by Eino-Ville Talvala · 9 years ago
  20. 6ddd08e CameraBase: Don't return an sp<> by reference am: 4b49489c12 am: 8c32699ceb am: 8806c2a11d am: 99c4dd2fe8 am: dd82ab2377 am: 1dd068cd45 by Eino-Ville Talvala · 9 years ago
  21. 06f46ca Merge "CameraBase: Don't return an sp<> by reference" into klp-dev am: fdf64bab96 am: 4fca12e56f am: f0009384d8 am: 7a14d95270 am: 888f5bab6d by Eino-Ville Talvala · 9 years ago
  22. edf9d2f CameraBase: Don't return an sp<> by reference am: 4b49489c12 am: 8c32699ceb am: 8806c2a11d am: 99c4dd2fe8 am: dd82ab2377 by Eino-Ville Talvala · 9 years ago
  23. a6b1816 Merge "CameraBase: Don't return an sp<> by reference" into klp-dev am: fdf64bab96 am: 4fca12e56f am: f0009384d8 am: 7a14d95270 by Eino-Ville Talvala · 9 years ago
  24. 1dd068c CameraBase: Don't return an sp<> by reference am: 4b49489c12 am: 8c32699ceb am: 8806c2a11d am: 99c4dd2fe8 by Eino-Ville Talvala · 9 years ago
  25. 888f5ba Merge "CameraBase: Don't return an sp<> by reference" into klp-dev am: fdf64bab96 am: 4fca12e56f am: f0009384d8 by Eino-Ville Talvala · 9 years ago
  26. dd82ab2 CameraBase: Don't return an sp<> by reference am: 4b49489c12 am: 8c32699ceb am: 8806c2a11d by Eino-Ville Talvala · 9 years ago
  27. 7a14d95 Merge "CameraBase: Don't return an sp<> by reference" into klp-dev am: fdf64bab96 am: 4fca12e56f by Eino-Ville Talvala · 9 years ago
  28. 99c4dd2 CameraBase: Don't return an sp<> by reference am: 4b49489c12 am: 8c32699ceb by Eino-Ville Talvala · 9 years ago
  29. f000938 Merge "CameraBase: Don't return an sp<> by reference" into klp-dev am: fdf64bab96 by Eino-Ville Talvala · 9 years ago
  30. 8806c2a CameraBase: Don't return an sp<> by reference am: 4b49489c12 am: 8c32699ceb by Eino-Ville Talvala · 9 years ago
  31. 4fca12e Merge "CameraBase: Don't return an sp<> by reference" into klp-dev by Eino-Ville Talvala · 9 years ago
  32. 8c32699 CameraBase: Don't return an sp<> by reference am: 4b49489c12 by Eino-Ville Talvala · 9 years ago
  33. fdf64ba Merge "CameraBase: Don't return an sp<> by reference" into klp-dev by Eino-Ville Talvala · 9 years ago
  34. 41d3046 Merge "CameraBase: Don't return an sp<> by reference" into nyc-dev by Eino-Ville Talvala · 9 years ago
  35. 42b1ea8 Turn off overflow protection for various math functions by Marco Nelissen · 9 years ago
  36. 4f34250 Revert "Turn off overflow protection for various math functions" am: 2dd1d5e02e am: aa5498018f am: ce9cab33b7 am: 4c1ad41c8b am: bd91a6540d am: 08ccbcc16f am: 9070697124 am: 9986938f08 am: 245b572340 by Marco Nelissen · 9 years ago
  37. d0bc460 Revert "Turn off overflow protection for various math functions" am: 2dd1d5e02e am: aa5498018f am: ce9cab33b7 am: 4c1ad41c8b am: bd91a6540d am: 08ccbcc16f am: 9070697124 am: 9986938f08 by Marco Nelissen · 9 years ago
  38. 245b572 Revert "Turn off overflow protection for various math functions" am: 2dd1d5e02e am: aa5498018f am: ce9cab33b7 am: 4c1ad41c8b am: bd91a6540d am: 08ccbcc16f am: 9070697124 by Marco Nelissen · 9 years ago
  39. 9986938 Revert "Turn off overflow protection for various math functions" am: 2dd1d5e02e am: aa5498018f am: ce9cab33b7 am: 4c1ad41c8b am: bd91a6540d am: 08ccbcc16f by Marco Nelissen · 9 years ago
  40. 9070697 Revert "Turn off overflow protection for various math functions" am: 2dd1d5e02e am: aa5498018f am: ce9cab33b7 am: 4c1ad41c8b am: bd91a6540d by Marco Nelissen · 9 years ago
  41. 08ccbcc Revert "Turn off overflow protection for various math functions" am: 2dd1d5e02e am: aa5498018f am: ce9cab33b7 am: 4c1ad41c8b by Marco Nelissen · 9 years ago
  42. bd91a65 Revert "Turn off overflow protection for various math functions" am: 2dd1d5e02e am: aa5498018f am: ce9cab33b7 by Marco Nelissen · 9 years ago
  43. 4c1ad41 Revert "Turn off overflow protection for various math functions" am: 2dd1d5e02e am: aa5498018f by Marco Nelissen · 9 years ago
  44. ce9cab3 Revert "Turn off overflow protection for various math functions" am: 2dd1d5e02e by Marco Nelissen · 9 years ago
  45. aa54980 Revert "Turn off overflow protection for various math functions" am: 2dd1d5e02e by Marco Nelissen · 9 years ago
  46. 2dd1d5e Revert "Turn off overflow protection for various math functions" by Marco Nelissen · 9 years ago
  47. f86177d CameraBase: Don't return an sp<> by reference by Eino-Ville Talvala · 9 years ago
  48. d1cc284 Turn off overflow protection for various math functions am: cbf5e6915c am: 72b1fdbf49 am: a25eb35608 am: 3d58f94eec am: 1edbc699b5 am: c0118375e5 am: ba78beef56 am: b0ceb402c1 am: e7a758e220 by Marco Nelissen · 9 years ago
  49. 350db71 Turn off overflow protection for various math functions am: cbf5e6915c am: 72b1fdbf49 am: a25eb35608 am: 3d58f94eec am: 1edbc699b5 am: c0118375e5 am: ba78beef56 am: b0ceb402c1 by Marco Nelissen · 9 years ago
  50. e7a758e Turn off overflow protection for various math functions am: cbf5e6915c am: 72b1fdbf49 am: a25eb35608 am: 3d58f94eec am: 1edbc699b5 am: c0118375e5 am: ba78beef56 by Marco Nelissen · 9 years ago
  51. b0ceb40 Turn off overflow protection for various math functions am: cbf5e6915c am: 72b1fdbf49 am: a25eb35608 am: 3d58f94eec am: 1edbc699b5 am: c0118375e5 by Marco Nelissen · 9 years ago
  52. ba78bee Turn off overflow protection for various math functions am: cbf5e6915c am: 72b1fdbf49 am: a25eb35608 am: 3d58f94eec am: 1edbc699b5 by Marco Nelissen · 9 years ago
  53. c011837 Turn off overflow protection for various math functions am: cbf5e6915c am: 72b1fdbf49 am: a25eb35608 am: 3d58f94eec by Marco Nelissen · 9 years ago
  54. 4b49489 CameraBase: Don't return an sp<> by reference by Eino-Ville Talvala · 9 years ago
  55. 1edbc69 Turn off overflow protection for various math functions am: cbf5e6915c am: 72b1fdbf49 am: a25eb35608 by Marco Nelissen · 9 years ago
  56. 3d58f94 Turn off overflow protection for various math functions am: cbf5e6915c am: 72b1fdbf49 by Marco Nelissen · 9 years ago
  57. a25eb35 Turn off overflow protection for various math functions am: cbf5e6915c by Marco Nelissen · 9 years ago
  58. 72b1fdb Turn off overflow protection for various math functions am: cbf5e6915c by Marco Nelissen · 9 years ago
  59. cbf5e69 Turn off overflow protection for various math functions by Marco Nelissen · 9 years ago
  60. 5337437 avc_utils: skip empty NALs from malformed bistreams am: 91fe76a157 am: f79f26d257 am: 2b5d2c4a10 am: b6e8b6b875 am: e277181b71 am: 1a9f5250d8 by Robert Shih · 9 years ago
  61. 4bf7107 avc_utils: skip empty NALs from malformed bistreams am: 91fe76a157 am: f79f26d257 am: 2b5d2c4a10 am: b6e8b6b875 am: e277181b71 by Robert Shih · 9 years ago
  62. 1a9f525 avc_utils: skip empty NALs from malformed bistreams am: 91fe76a157 am: f79f26d257 am: 2b5d2c4a10 am: b6e8b6b875 by Robert Shih · 9 years ago
  63. e277181 avc_utils: skip empty NALs from malformed bistreams am: 91fe76a157 am: f79f26d257 am: 2b5d2c4a10 by Robert Shih · 9 years ago
  64. b6e8b6b avc_utils: skip empty NALs from malformed bistreams am: 91fe76a157 am: f79f26d257 by Robert Shih · 9 years ago
  65. 2b5d2c4 avc_utils: skip empty NALs from malformed bistreams am: 91fe76a157 by Robert Shih · 9 years ago
  66. f79f26d avc_utils: skip empty NALs from malformed bistreams am: 91fe76a157 by Robert Shih · 9 years ago
  67. 91fe76a avc_utils: skip empty NALs from malformed bistreams by Robert Shih · 9 years ago
  68. 9b6b81d stagefright: parseApp check data boundary conditions by Mark Salyzyn · 11 years ago
  69. 76f5a38 DO NOT MERGE - improve audio effect framwework thread safety am: 7da83aadf4 am: 5717bb1acb -s ours am: 199484a558 am: fff4a6aff9 am: c8fbf1a97c by Eric Laurent · 9 years ago
  70. 8e24a55 DO NOT MERGE - improve audio effect framwework thread safety am: 7da83aadf4 am: 5717bb1acb -s ours am: 199484a558 am: fff4a6aff9 by Eric Laurent · 9 years ago
  71. c8fbf1a DO NOT MERGE - improve audio effect framwework thread safety am: 7da83aadf4 am: 5717bb1acb -s ours am: 199484a558 by Eric Laurent · 9 years ago
  72. fff4a6a DO NOT MERGE - improve audio effect framwework thread safety am: 7da83aadf4 am: 5717bb1acb -s ours by Eric Laurent · 9 years ago
  73. 199484a DO NOT MERGE - improve audio effect framwework thread safety am: 7da83aadf4 by Eric Laurent · 9 years ago
  74. 5717bb1 DO NOT MERGE - improve audio effect framwework thread safety am: 7da83aadf4 by Eric Laurent · 9 years ago
  75. 7da83aa DO NOT MERGE - improve audio effect framwework thread safety by Eric Laurent · 9 years ago
  76. 41dab9b Don't CHECK when buffer is too large am: c2f0c73bfc am: acb7186e6e am: 0a4db601b4 am: 8474c51aaf am: a5333c0056 am: 7e5936e666 am: 81341d9c16 am: 5a62595e8e am: a2c05e0318 by Marco Nelissen · 9 years ago
  77. 04a4572 Don't CHECK when buffer is too large am: c2f0c73bfc am: acb7186e6e am: 0a4db601b4 am: 8474c51aaf am: a5333c0056 am: 7e5936e666 am: 81341d9c16 am: 5a62595e8e by Marco Nelissen · 9 years ago
  78. a2c05e0 Don't CHECK when buffer is too large am: c2f0c73bfc am: acb7186e6e am: 0a4db601b4 am: 8474c51aaf am: a5333c0056 am: 7e5936e666 am: 81341d9c16 by Marco Nelissen · 9 years ago
  79. 5a62595 Don't CHECK when buffer is too large am: c2f0c73bfc am: acb7186e6e am: 0a4db601b4 am: 8474c51aaf am: a5333c0056 am: 7e5936e666 by Marco Nelissen · 9 years ago
  80. 81341d9 Don't CHECK when buffer is too large am: c2f0c73bfc am: acb7186e6e am: 0a4db601b4 am: 8474c51aaf am: a5333c0056 by Marco Nelissen · 9 years ago
  81. 7e5936e Don't CHECK when buffer is too large am: c2f0c73bfc am: acb7186e6e am: 0a4db601b4 am: 8474c51aaf by Marco Nelissen · 9 years ago
  82. a5333c0 Don't CHECK when buffer is too large am: c2f0c73bfc am: acb7186e6e am: 0a4db601b4 by Marco Nelissen · 9 years ago
  83. 8474c51 Don't CHECK when buffer is too large am: c2f0c73bfc am: acb7186e6e by Marco Nelissen · 9 years ago
  84. 0a4db60 Don't CHECK when buffer is too large am: c2f0c73bfc am: acb7186e6e by Marco Nelissen · 9 years ago
  85. acb7186 Don't CHECK when buffer is too large am: c2f0c73bfc by Marco Nelissen · 9 years ago
  86. 835c7ec Don't initialize sync sample parameters until the end am: a9660fe122 am: 22386993b5 am: 902d8e90cc am: 25a057e427 am: c3ea68a1c8 am: a59dca6634 by Marco Nelissen · 9 years ago
  87. 5cc0712 Don't initialize sync sample parameters until the end am: a9660fe122 am: 22386993b5 am: 902d8e90cc am: 25a057e427 am: c3ea68a1c8 by Marco Nelissen · 9 years ago
  88. a59dca6 Don't initialize sync sample parameters until the end am: a9660fe122 am: 22386993b5 am: 902d8e90cc am: 25a057e427 by Marco Nelissen · 9 years ago
  89. c3ea68a Don't initialize sync sample parameters until the end am: a9660fe122 am: 22386993b5 am: 902d8e90cc by Marco Nelissen · 9 years ago
  90. 25a057e Don't initialize sync sample parameters until the end am: a9660fe122 am: 22386993b5 by Marco Nelissen · 9 years ago
  91. 902d8e9 Don't initialize sync sample parameters until the end am: a9660fe122 by Marco Nelissen · 9 years ago
  92. 2238699 Don't initialize sync sample parameters until the end am: a9660fe122 by Marco Nelissen · 9 years ago
  93. 5ab2dba Merge "DO NOT MERGE ANYWHERE - improve audio effect framwework thread safety" into nyc-dev by Eric Laurent · 9 years ago
  94. a9660fe Don't initialize sync sample parameters until the end by Marco Nelissen · 9 years ago
  95. c2f0c73 Don't CHECK when buffer is too large by Marco Nelissen · 9 years ago
  96. 9ddb80f DO NOT MERGE - improve audio effect framwework thread safety am: b47a5ab107 am: 26cf2f4d73 am: 73a152960b -s ours am: 21d6eafd26 -s ours am: 6c5deab4f2 am: 9685820100 -s ours am: 6608eddab9 am: c6a7a42379 am: d1b6293802 by Eric Laurent · 9 years ago
  97. 1771044 DO NOT MERGE - improve audio effect framwework thread safety am: b47a5ab107 am: 26cf2f4d73 am: 73a152960b -s ours am: 21d6eafd26 -s ours am: 6c5deab4f2 am: 9685820100 -s ours am: 6608eddab9 am: c6a7a42379 by Eric Laurent · 9 years ago
  98. d1b6293 DO NOT MERGE - improve audio effect framwework thread safety am: b47a5ab107 am: 26cf2f4d73 am: 73a152960b -s ours am: 21d6eafd26 -s ours am: 6c5deab4f2 am: 9685820100 -s ours am: 6608eddab9 by Eric Laurent · 9 years ago
  99. c6a7a42 DO NOT MERGE - improve audio effect framwework thread safety am: b47a5ab107 am: 26cf2f4d73 am: 73a152960b -s ours am: 21d6eafd26 -s ours am: 6c5deab4f2 am: 9685820100 -s ours by Eric Laurent · 9 years ago
  100. 7454e9d DO NOT MERGE - improve audio effect framwework thread safety am: 84c392104e -s ours am: 5d5f9cd28a am: 10f61954ba -s ours am: bb4c9408ec am: 642e5857fe am: b763905a4f by Eric Laurent · 9 years ago