1. e469b59 am 4d1ca6fb: (-s ours) Reconcile with jb-mr1-release - do not merge by The Android Open Source Project · 14 years ago
  2. 4d1ca6f Reconcile with jb-mr1-release - do not merge by The Android Open Source Project · 14 years ago
  3. 7f8be6a am 1bfad87c: am 02d3c328: am 523c09d5: am 64b3fe55: Merge "stagefright amrnb: Remove unused leftover source files" by Jean-Baptiste Queru · 14 years ago
  4. 0dffa23 am bf407d4d: am f81ed003: am f20e4ad9: am c1d2777c: Merge "stagefright amrnb: Move the bitstream_format enum into frame_type_3gpp.h" by Jean-Baptiste Queru · 14 years ago
  5. 1bfad87 am 02d3c328: am 523c09d5: am 64b3fe55: Merge "stagefright amrnb: Remove unused leftover source files" by Jean-Baptiste Queru · 14 years ago
  6. bf407d4 am f81ed003: am f20e4ad9: am c1d2777c: Merge "stagefright amrnb: Move the bitstream_format enum into frame_type_3gpp.h" by Jean-Baptiste Queru · 14 years ago
  7. 02d3c32 am 523c09d5: am 64b3fe55: Merge "stagefright amrnb: Remove unused leftover source files" by Jean-Baptiste Queru · 14 years ago
  8. f81ed00 am f20e4ad9: am c1d2777c: Merge "stagefright amrnb: Move the bitstream_format enum into frame_type_3gpp.h" by Jean-Baptiste Queru · 14 years ago
  9. 523c09d am 64b3fe55: Merge "stagefright amrnb: Remove unused leftover source files" by Jean-Baptiste Queru · 14 years ago
  10. f20e4ad am c1d2777c: Merge "stagefright amrnb: Move the bitstream_format enum into frame_type_3gpp.h" by Jean-Baptiste Queru · 14 years ago
  11. fcae215 am 9b9b8a9e: am 08ebb6b1: Merge "Camera2: Fix SCENE_MODE" into jb-mr1-dev by Eino-Ville Talvala · 14 years ago
  12. 9b9b8a9 am 08ebb6b1: Merge "Camera2: Fix SCENE_MODE" into jb-mr1-dev by Eino-Ville Talvala · 14 years ago
  13. 08ebb6b Merge "Camera2: Fix SCENE_MODE" into jb-mr1-dev by Eino-Ville Talvala · 14 years ago
  14. 3cc8979 Camera2: Fix SCENE_MODE by Eino-Ville Talvala · 14 years ago
  15. 64b3fe5 Merge "stagefright amrnb: Remove unused leftover source files" by Jean-Baptiste Queru · 14 years ago
  16. c1d2777 Merge "stagefright amrnb: Move the bitstream_format enum into frame_type_3gpp.h" by Jean-Baptiste Queru · 14 years ago
  17. 3f4e81f am 1fd11507: am 7df98f17: am 0df213ba: am dde79acf: Merge "hardening: eliminate text relocations from mp3" by Jean-Baptiste Queru · 14 years ago
  18. 12c750d am 120462a9: am 1a42aee5: am a109e9d5: am b7ca7dc9: Merge "avcenc: Clarify the ifdefs surrounding inline assembly" by Jean-Baptiste Queru · 14 years ago
  19. d37ade3 am 706f36c7: am 9bd763d1: am fba9d50d: am 4f981882: Merge "hardening: eliminate text relocations from amrwb" by Jean-Baptiste Queru · 14 years ago
  20. 4ea4d13 am a83ec8c5: am f365fecf: am 1191287b: am c3bfa026: Merge "aacenc/amrwbenc: Remove the now unused LINUX define" by Jean-Baptiste Queru · 14 years ago
  21. 7db4468 am 2f72739b: am fa172b0d: am eeb9fde0: am 3f5d2e17: Merge "aacenc/amrwbenc: Remove unused and dubious typedefs" by Jean-Baptiste Queru · 14 years ago
  22. 1fd1150 am 7df98f17: am 0df213ba: am dde79acf: Merge "hardening: eliminate text relocations from mp3" by Jean-Baptiste Queru · 14 years ago
  23. 120462a am 1a42aee5: am a109e9d5: am b7ca7dc9: Merge "avcenc: Clarify the ifdefs surrounding inline assembly" by Jean-Baptiste Queru · 14 years ago
  24. 706f36c am 9bd763d1: am fba9d50d: am 4f981882: Merge "hardening: eliminate text relocations from amrwb" by Jean-Baptiste Queru · 14 years ago
  25. a83ec8c am f365fecf: am 1191287b: am c3bfa026: Merge "aacenc/amrwbenc: Remove the now unused LINUX define" by Jean-Baptiste Queru · 14 years ago
  26. 2f72739 am fa172b0d: am eeb9fde0: am 3f5d2e17: Merge "aacenc/amrwbenc: Remove unused and dubious typedefs" by Jean-Baptiste Queru · 14 years ago
  27. 7df98f1 am 0df213ba: am dde79acf: Merge "hardening: eliminate text relocations from mp3" by Jean-Baptiste Queru · 14 years ago
  28. 1a42aee am a109e9d5: am b7ca7dc9: Merge "avcenc: Clarify the ifdefs surrounding inline assembly" by Jean-Baptiste Queru · 14 years ago
  29. 9bd763d am fba9d50d: am 4f981882: Merge "hardening: eliminate text relocations from amrwb" by Jean-Baptiste Queru · 14 years ago
  30. f365fec am 1191287b: am c3bfa026: Merge "aacenc/amrwbenc: Remove the now unused LINUX define" by Jean-Baptiste Queru · 14 years ago
  31. fa172b0 am eeb9fde0: am 3f5d2e17: Merge "aacenc/amrwbenc: Remove unused and dubious typedefs" by Jean-Baptiste Queru · 14 years ago
  32. 0df213b am dde79acf: Merge "hardening: eliminate text relocations from mp3" by Jean-Baptiste Queru · 14 years ago
  33. a109e9d am b7ca7dc9: Merge "avcenc: Clarify the ifdefs surrounding inline assembly" by Jean-Baptiste Queru · 14 years ago
  34. fba9d50 am 4f981882: Merge "hardening: eliminate text relocations from amrwb" by Jean-Baptiste Queru · 14 years ago
  35. 1191287 am c3bfa026: Merge "aacenc/amrwbenc: Remove the now unused LINUX define" by Jean-Baptiste Queru · 14 years ago
  36. eeb9fde am 3f5d2e17: Merge "aacenc/amrwbenc: Remove unused and dubious typedefs" by Jean-Baptiste Queru · 14 years ago
  37. dde79ac Merge "hardening: eliminate text relocations from mp3" by Jean-Baptiste Queru · 14 years ago
  38. b7ca7dc Merge "avcenc: Clarify the ifdefs surrounding inline assembly" by Jean-Baptiste Queru · 14 years ago
  39. 4f98188 Merge "hardening: eliminate text relocations from amrwb" by Jean-Baptiste Queru · 14 years ago
  40. c3bfa02 Merge "aacenc/amrwbenc: Remove the now unused LINUX define" by Jean-Baptiste Queru · 14 years ago
  41. 3f5d2e1 Merge "aacenc/amrwbenc: Remove unused and dubious typedefs" by Jean-Baptiste Queru · 14 years ago
  42. 2ce2552 merge in jb-mr1-release history after reset to jb-mr1-dev by The Android Automerger · 14 years ago
  43. fef71ef aacenc/amrwbenc: Remove the now unused LINUX define by Martin Storsjo · 15 years ago
  44. adee070 aacenc/amrwbenc: Remove unused and dubious typedefs by Martin Storsjo · 15 years ago
  45. 9b5d15c am ff42ad87: am ce088d27: am add9f820: am 2c3d9b7b: Merge "MPEG2TSWriter: Correctly add padding using the adaptation field" by Jean-Baptiste Queru · 14 years ago
  46. ff42ad8 am ce088d27: am add9f820: am 2c3d9b7b: Merge "MPEG2TSWriter: Correctly add padding using the adaptation field" by Jean-Baptiste Queru · 14 years ago
  47. ce088d2 am add9f820: am 2c3d9b7b: Merge "MPEG2TSWriter: Correctly add padding using the adaptation field" by Jean-Baptiste Queru · 14 years ago
  48. add9f82 am 2c3d9b7b: Merge "MPEG2TSWriter: Correctly add padding using the adaptation field" by Jean-Baptiste Queru · 14 years ago
  49. 2c3d9b7 Merge "MPEG2TSWriter: Correctly add padding using the adaptation field" by Jean-Baptiste Queru · 14 years ago
  50. 99b99df MPEG2TSWriter: Correctly add padding using the adaptation field by Paul Fariello · 15 years ago
  51. 068515d am 39ae04bc: (-s ours) Reconcile with jb-mr1-release - do not merge by The Android Open Source Project · 14 years ago
  52. 39ae04b Reconcile with jb-mr1-release - do not merge by The Android Open Source Project · 14 years ago
  53. 5dea1ce merge in jb-mr1-release history after reset to jb-mr1-dev by The Android Automerger · 14 years ago
  54. ce7db89 am 86e2067c: am f363ec55: Merge "Camera2: Skeleton for output frame processing, plus face detect" into jb-mr1-dev by Eino-Ville Talvala · 14 years ago
  55. 86e2067 am f363ec55: Merge "Camera2: Skeleton for output frame processing, plus face detect" into jb-mr1-dev by Eino-Ville Talvala · 14 years ago
  56. f363ec5 Merge "Camera2: Skeleton for output frame processing, plus face detect" into jb-mr1-dev by Eino-Ville Talvala · 14 years ago
  57. 8ce89d9 Camera2: Skeleton for output frame processing, plus face detect by Eino-Ville Talvala · 14 years ago
  58. 1d5c225 merge in jb-mr1-release history after reset to jb-mr1-dev by The Android Automerger · 14 years ago
  59. ea28831 am b3c5f569: am 0088e930: Merge "Fix AAC DRC metadata being ignored" into jb-mr1-dev by Jean-Michel Trivi · 14 years ago
  60. b3c5f56 am 0088e930: Merge "Fix AAC DRC metadata being ignored" into jb-mr1-dev by Jean-Michel Trivi · 14 years ago
  61. 0088e93 Merge "Fix AAC DRC metadata being ignored" into jb-mr1-dev by Jean-Michel Trivi · 14 years ago
  62. 5696a4e Fix AAC DRC metadata being ignored by Jean-Michel Trivi · 14 years ago
  63. 4467574 am 99d777a2: am 93b68548: am 979df012: am 98159acd: Merge "amrnb: Restart the p_xn pointer when retraversing the array on overflow" by Jean-Baptiste Queru · 14 years ago
  64. 99d777a am 93b68548: am 979df012: am 98159acd: Merge "amrnb: Restart the p_xn pointer when retraversing the array on overflow" by Jean-Baptiste Queru · 14 years ago
  65. 93b6854 am 979df012: am 98159acd: Merge "amrnb: Restart the p_xn pointer when retraversing the array on overflow" by Jean-Baptiste Queru · 14 years ago
  66. 979df01 am 98159acd: Merge "amrnb: Restart the p_xn pointer when retraversing the array on overflow" by Jean-Baptiste Queru · 14 years ago
  67. 98159ac Merge "amrnb: Restart the p_xn pointer when retraversing the array on overflow" by Jean-Baptiste Queru · 14 years ago
  68. 9a2c14b hardening: eliminate text relocations from mp3 by Ard Biesheuvel · 14 years ago
  69. 74bc3e1 hardening: eliminate text relocations from amrwb by Ard Biesheuvel · 14 years ago
  70. b45786b am a6a266d0: am 106e8a42: const methods by Glenn Kasten · 14 years ago
  71. a6a266d am 106e8a42: const methods by Glenn Kasten · 14 years ago
  72. 2ef6e19 am 0319e9e3: am 0dbb3560: Simplify AudioFlinger::PlaybackThread::isValidSyncEvent() by Glenn Kasten · 14 years ago
  73. 0319e9e am 0dbb3560: Simplify AudioFlinger::PlaybackThread::isValidSyncEvent() by Glenn Kasten · 14 years ago
  74. 106e8a4 const methods by Glenn Kasten · 14 years ago
  75. bfb3fec am b2f2d164: am d23eedca: Discard setSyncEvent() return value by Glenn Kasten · 14 years ago
  76. b2f2d16 am d23eedca: Discard setSyncEvent() return value by Glenn Kasten · 14 years ago
  77. 0dbb356 Simplify AudioFlinger::PlaybackThread::isValidSyncEvent() by Glenn Kasten · 14 years ago
  78. 2917080 am f0235625: am a9599049: Merge "Replace hard-coded "2" by a constant and comment" into jb-mr1-dev by Glenn Kasten · 14 years ago
  79. d23eedc Discard setSyncEvent() return value by Glenn Kasten · 14 years ago
  80. f023562 am a9599049: Merge "Replace hard-coded "2" by a constant and comment" into jb-mr1-dev by Glenn Kasten · 14 years ago
  81. a959904 Merge "Replace hard-coded "2" by a constant and comment" into jb-mr1-dev by Glenn Kasten · 14 years ago
  82. bf4c5d9 am 1f3d61f9: am bd828233: Use the correct data offset by remembering the offset of the enclosing \'moof\' by Andreas Huber · 14 years ago
  83. 1f3d61f am bd828233: Use the correct data offset by remembering the offset of the enclosing \'moof\' by Andreas Huber · 14 years ago
  84. bd82823 Use the correct data offset by remembering the offset of the enclosing 'moof' by Andreas Huber · 14 years ago
  85. 38b8d56 am f64f9b2d: am 8cf9c1a8: am 10004fe6: am 5efa7bf9: Merge "amrnb: Fix audio distortion in an AMR-NB clip" by Jean-Baptiste Queru · 14 years ago
  86. f64f9b2 am 8cf9c1a8: am 10004fe6: am 5efa7bf9: Merge "amrnb: Fix audio distortion in an AMR-NB clip" by Jean-Baptiste Queru · 14 years ago
  87. 8cf9c1a am 10004fe6: am 5efa7bf9: Merge "amrnb: Fix audio distortion in an AMR-NB clip" by Jean-Baptiste Queru · 14 years ago
  88. 10004fe am 5efa7bf9: Merge "amrnb: Fix audio distortion in an AMR-NB clip" by Jean-Baptiste Queru · 14 years ago
  89. 5efa7bf Merge "amrnb: Fix audio distortion in an AMR-NB clip" by Jean-Baptiste Queru · 14 years ago
  90. 4fc9d47 am 73247cac: am d58a68a4: Merge changes Ibe7e6d4b,Icf8904db into jb-mr1-dev by John Grossman · 14 years ago
  91. 518cdbe am 6f1ecc98: am 75767ab7: Merge "Signal end of stream if no more fragments are going to be available." into jb-mr1-dev by Andreas Huber · 14 years ago
  92. 73247ca am d58a68a4: Merge changes Ibe7e6d4b,Icf8904db into jb-mr1-dev by John Grossman · 14 years ago
  93. 6f1ecc9 am 75767ab7: Merge "Signal end of stream if no more fragments are going to be available." into jb-mr1-dev by Andreas Huber · 14 years ago
  94. d58a68a Merge changes Ibe7e6d4b,Icf8904db into jb-mr1-dev by John Grossman · 14 years ago
  95. 75767ab Merge "Signal end of stream if no more fragments are going to be available." into jb-mr1-dev by Andreas Huber · 14 years ago
  96. 8ec1f2a Move the AAH RTP code out of framework and into vendor. by John Grossman · 14 years ago
  97. 44a7e42 Add the ability to dynamicaly register MediaPlayer types. by John Grossman · 14 years ago
  98. dce5500 merge in jb-mr1-release history after reset to jb-mr1-dev by The Android Automerger · 14 years ago
  99. 006406f am b18a26cd: am b3e12a4d: am 3ca352c4: am 24893fef: Merge "MPEG2TSWriter: Write a proper CRC in PAT and PMT" by Jean-Baptiste Queru · 14 years ago
  100. b18a26c am b3e12a4d: am 3ca352c4: am 24893fef: Merge "MPEG2TSWriter: Write a proper CRC in PAT and PMT" by Jean-Baptiste Queru · 14 years ago