1. 1ebe2d7 Reconcile with jb-mr1-release - do not merge by The Android Open Source Project · 14 years ago
  2. 8f8bffd am faa88edb: Merge "Fix static sample table processing, add support for h.263 video." into jb-mr1-dev by Andreas Huber · 14 years ago
  3. faa88ed Merge "Fix static sample table processing, add support for h.263 video." into jb-mr1-dev by Andreas Huber · 14 years ago
  4. b978714 Fix static sample table processing, add support for h.263 video. by Andreas Huber · 14 years ago
  5. 744100a am 9352d116: Remove some unused forward lock code by James Dong · 14 years ago
  6. a0f3d22 merge in jb-mr1-release history after reset to jb-mr1-dev by The Android Automerger · 14 years ago
  7. 9352d11 Remove some unused forward lock code by James Dong · 14 years ago
  8. 638f936 am 0d27c65d: Tune the overrun correction by Glenn Kasten · 14 years ago
  9. 0d27c65 Tune the overrun correction by Glenn Kasten · 14 years ago
  10. fc9d21b am e983aa4f: am 51af4af2: am e28df5b9: Merge "Store correct time stamps in recorded mp4 files" by Jean-Baptiste Queru · 14 years ago
  11. e983aa4 am 51af4af2: am e28df5b9: Merge "Store correct time stamps in recorded mp4 files" by Jean-Baptiste Queru · 14 years ago
  12. 51af4af am e28df5b9: Merge "Store correct time stamps in recorded mp4 files" by Jean-Baptiste Queru · 14 years ago
  13. e28df5b Merge "Store correct time stamps in recorded mp4 files" by Jean-Baptiste Queru · 14 years ago
  14. acc5c27 am f6a35760: Merge "AudioFlinger: fix timed audio" into jb-mr1-dev by John Grossman · 14 years ago
  15. e5262c7 am 6febe17c: Merge "AudioFlinger: Better handling for master volume/mute" into jb-mr1-dev by John Grossman · 14 years ago
  16. 952f6bf am 3f0b1eaa: Merge "Change audio flinger to user HAL master mute if available" into jb-mr1-dev by John Grossman · 14 years ago
  17. eb8cffd am 1e357f46: am ef620093: am efee0095: Merge "Correct ID3::StringSize calculation for UCS-2 data." by Jean-Baptiste Queru · 14 years ago
  18. 88ed043 am 4bb0e2aa: am 662b15c3: am a858aa96: Merge "avcenc: Remove redundant zero-initialization of allocated memory" by Jean-Baptiste Queru · 14 years ago
  19. dadf369 am 49e74946: am 44237a8d: am b71298ee: Merge "avcenc: Initialize all memory allocated by the CBAVC_Malloc callback function" by Jean-Baptiste Queru · 14 years ago
  20. 1a56274 am f5a66877: am 68d44b06: am 0ab18f85: Merge "avcenc: Remove useless casts" by Jean-Baptiste Queru · 14 years ago
  21. 7cad90a am 76d46c5a: am 4348cbce: am 67f694d6: Merge "Initialize pool\'s buffer pointers to null." by Jean-Baptiste Queru · 14 years ago
  22. 6f29245 am 93f902d5: am 96d18cca: am 0822156c: Merge "avcenc: Fix indentation" by Jean-Baptiste Queru · 14 years ago
  23. 013c9c3 am 3269b531: am 80c46255: am 874a074a: Merge "avcenc: Switch malloc/free callbacks to use pointers instead of ints" by Jean-Baptiste Queru · 14 years ago
  24. a018268 am c107387c: am 17fa4ab4: am b7ee9c44: Merge "mediacodec: Return an error on getOutputFormat if there is no output format yet" by Jean-Baptiste Queru · 14 years ago
  25. f6a35760 Merge "AudioFlinger: fix timed audio" into jb-mr1-dev by John Grossman · 14 years ago
  26. 6febe17 Merge "AudioFlinger: Better handling for master volume/mute" into jb-mr1-dev by John Grossman · 14 years ago
  27. 3f0b1ea Merge "Change audio flinger to user HAL master mute if available" into jb-mr1-dev by John Grossman · 14 years ago
  28. 1e357f4 am ef620093: am efee0095: Merge "Correct ID3::StringSize calculation for UCS-2 data." by Jean-Baptiste Queru · 14 years ago
  29. 4bb0e2a am 662b15c3: am a858aa96: Merge "avcenc: Remove redundant zero-initialization of allocated memory" by Jean-Baptiste Queru · 14 years ago
  30. 49e7494 am 44237a8d: am b71298ee: Merge "avcenc: Initialize all memory allocated by the CBAVC_Malloc callback function" by Jean-Baptiste Queru · 14 years ago
  31. f5a6687 am 68d44b06: am 0ab18f85: Merge "avcenc: Remove useless casts" by Jean-Baptiste Queru · 14 years ago
  32. 76d46c5 am 4348cbce: am 67f694d6: Merge "Initialize pool\'s buffer pointers to null." by Jean-Baptiste Queru · 14 years ago
  33. 93f902d am 96d18cca: am 0822156c: Merge "avcenc: Fix indentation" by Jean-Baptiste Queru · 14 years ago
  34. 3269b53 am 80c46255: am 874a074a: Merge "avcenc: Switch malloc/free callbacks to use pointers instead of ints" by Jean-Baptiste Queru · 14 years ago
  35. c107387 am 17fa4ab4: am b7ee9c44: Merge "mediacodec: Return an error on getOutputFormat if there is no output format yet" by Jean-Baptiste Queru · 14 years ago
  36. ef62009 am efee0095: Merge "Correct ID3::StringSize calculation for UCS-2 data." by Jean-Baptiste Queru · 14 years ago
  37. 662b15c am a858aa96: Merge "avcenc: Remove redundant zero-initialization of allocated memory" by Jean-Baptiste Queru · 14 years ago
  38. 44237a8 am b71298ee: Merge "avcenc: Initialize all memory allocated by the CBAVC_Malloc callback function" by Jean-Baptiste Queru · 14 years ago
  39. 68d44b0 am 0ab18f85: Merge "avcenc: Remove useless casts" by Jean-Baptiste Queru · 14 years ago
  40. 4348cbc am 67f694d6: Merge "Initialize pool\'s buffer pointers to null." by Jean-Baptiste Queru · 14 years ago
  41. 96d18cc am 0822156c: Merge "avcenc: Fix indentation" by Jean-Baptiste Queru · 14 years ago
  42. 80c4625 am 874a074a: Merge "avcenc: Switch malloc/free callbacks to use pointers instead of ints" by Jean-Baptiste Queru · 14 years ago
  43. 17fa4ab am b7ee9c44: Merge "mediacodec: Return an error on getOutputFormat if there is no output format yet" by Jean-Baptiste Queru · 14 years ago
  44. efee009 Merge "Correct ID3::StringSize calculation for UCS-2 data." by Jean-Baptiste Queru · 14 years ago
  45. a858aa9 Merge "avcenc: Remove redundant zero-initialization of allocated memory" by Jean-Baptiste Queru · 14 years ago
  46. b71298e Merge "avcenc: Initialize all memory allocated by the CBAVC_Malloc callback function" by Jean-Baptiste Queru · 14 years ago
  47. 0ab18f8 Merge "avcenc: Remove useless casts" by Jean-Baptiste Queru · 14 years ago
  48. 67f694d Merge "Initialize pool's buffer pointers to null." by Jean-Baptiste Queru · 14 years ago
  49. 0822156 Merge "avcenc: Fix indentation" by Jean-Baptiste Queru · 14 years ago
  50. 874a074 Merge "avcenc: Switch malloc/free callbacks to use pointers instead of ints" by Jean-Baptiste Queru · 14 years ago
  51. b7ee9c4 Merge "mediacodec: Return an error on getOutputFormat if there is no output format yet" by Jean-Baptiste Queru · 14 years ago
  52. 5ed3e21 am 3478eaa2: Fix a small build warning. by John Grossman · 14 years ago
  53. 2c3b2da AudioFlinger: fix timed audio by John Grossman · 14 years ago
  54. ee578c0 AudioFlinger: Better handling for master volume/mute by John Grossman · 14 years ago
  55. d8f178d Change audio flinger to user HAL master mute if available by John Grossman · 14 years ago
  56. 3478eaa Fix a small build warning. by John Grossman · 14 years ago
  57. c3042db am 6fb082ae: Merge "Make sure that the trackId starts from 1" into jb-mr1-dev by James Dong · 14 years ago
  58. 6fb082a Merge "Make sure that the trackId starts from 1" into jb-mr1-dev by James Dong · 14 years ago
  59. ef8532b am e2229fba: Merge "Handle empty stsc box" into jb-mr1-dev by Marco Nelissen · 14 years ago
  60. e2229fb Merge "Handle empty stsc box" into jb-mr1-dev by Marco Nelissen · 14 years ago
  61. b7e75cf Handle empty stsc box by Marco Nelissen · 14 years ago
  62. 876b7b5 Reconcile with jb-mr1-release - do not merge by The Android Open Source Project · 14 years ago
  63. ba668e0 merge in jb-mr1-release history after reset to jb-mr1-dev by The Android Automerger · 14 years ago
  64. 219f195 Make sure that the trackId starts from 1 by James Dong · 14 years ago
  65. 7047e4a am a9e0ea58: Merge "Remove the no longer used PV software aac decoder." into jb-mr1-dev by Andreas Huber · 14 years ago
  66. a9e0ea5 Merge "Remove the no longer used PV software aac decoder." into jb-mr1-dev by Andreas Huber · 14 years ago
  67. b01b83c am 51d75479: Only emit padding at the end of the stream in the aac and mp3 decoders by Andreas Huber · 14 years ago
  68. 1f88347 Remove the no longer used PV software aac decoder. by Andreas Huber · 14 years ago
  69. 51d7547 Only emit padding at the end of the stream in the aac and mp3 decoders by Andreas Huber · 14 years ago
  70. 50f4109 am e6712071: Make sure codec names and corresponding quirks are returned together. by Andreas Huber · 14 years ago
  71. e671207 Make sure codec names and corresponding quirks are returned together. by Andreas Huber · 14 years ago
  72. 119254b am 28620ee3: Merge "mediacodec: Return an error on getOutputFormat if there is no output format yet" into jb-mr1-dev by Andreas Huber · 14 years ago
  73. 28620ee Merge "mediacodec: Return an error on getOutputFormat if there is no output format yet" into jb-mr1-dev by Andreas Huber · 14 years ago
  74. 972f232 mediacodec: Return an error on getOutputFormat if there is no output format yet by Martin Storsjo · 14 years ago
  75. 0624f91 Reconcile with jb-mr1-release - do not merge by The Android Open Source Project · 14 years ago
  76. 1b782a9 am 42c5ef98: Merge "Remove obsolete hack for TI specific code" into jb-mr1-dev by James Dong · 14 years ago
  77. 42c5ef9 Merge "Remove obsolete hack for TI specific code" into jb-mr1-dev by James Dong · 14 years ago
  78. f5043b0 merge in jb-mr1-release history after reset to jb-mr1-dev by The Android Automerger · 14 years ago
  79. a6ee7bc Remove obsolete hack for TI specific code by James Dong · 14 years ago
  80. cb66877 am 97197157: Camera2: Reduce redundant device dumpsys by Eino-Ville Talvala · 14 years ago
  81. 9719715 Camera2: Reduce redundant device dumpsys by Eino-Ville Talvala · 14 years ago
  82. caa99d6 Reconcile with jb-mr1-release - do not merge by The Android Open Source Project · 14 years ago
  83. 68cdf70 Reconcile with jb-mr1-release - do not merge by The Android Open Source Project · 14 years ago
  84. fcbb8af Fix a deadlock in commandSetVideoBufferCountL() by James Dong · 14 years ago
  85. 7ec5737 merge in jb-mr1-release history after reset to jb-mr1-dev by The Android Automerger · 14 years ago
  86. da608d5 am 8da4cd7d: Fix a deadlock in commandSetVideoBufferCountL() by James Dong · 14 years ago
  87. 8da4cd7 Fix a deadlock in commandSetVideoBufferCountL() by James Dong · 14 years ago
  88. 7dad0e9 am d9f02533: Merge "Camera2: Add notification handling skeleton." into jb-mr1-dev by Eino-Ville Talvala · 14 years ago
  89. d9f0253 Merge "Camera2: Add notification handling skeleton." into jb-mr1-dev by Eino-Ville Talvala · 14 years ago
  90. b81dcd5 am e643ccba: Merge "Remove circular dependency." into jb-mr1-dev by Ying Wang · 14 years ago
  91. e643ccb Merge "Remove circular dependency." into jb-mr1-dev by Ying Wang · 14 years ago
  92. 8d5ec2a Remove circular dependency. by Ying Wang · 14 years ago
  93. 160d4af Camera2: Add notification handling skeleton. by Eino-Ville Talvala · 14 years ago
  94. c9b125a am a3b71fa5: Merge "experimental support for fragmented mp4 playback in nuplayer" into jb-mr1-dev by Marco Nelissen · 14 years ago
  95. a3b71fa Merge "experimental support for fragmented mp4 playback in nuplayer" into jb-mr1-dev by Marco Nelissen · 14 years ago
  96. 8406678 experimental support for fragmented mp4 playback in nuplayer by Andreas Huber · 15 years ago
  97. 8e888ec am 36cdfb18: Camera2: Break out individual commands by Eino-Ville Talvala · 14 years ago
  98. 36cdfb1 Camera2: Break out individual commands by Eino-Ville Talvala · 14 years ago
  99. 903f037 am 983cf231: Dynamically configure the number of video buffers used by camera source, if supported by James Dong · 14 years ago
  100. 983cf23 Dynamically configure the number of video buffers used by camera source, if supported by James Dong · 14 years ago