Gitiles
Code Review Sign In
review.evervolv.com / android_frameworks_av / b903dcc107c80feb5aac913a632516bef8fafac1
  1. b903dcc am 0cdfa122: (-s ours) Reconcile with jb-mr1-release - do not merge by The Android Open Source Project · 14 years ago
  2. 0cdfa12 Reconcile with jb-mr1-release - do not merge by The Android Open Source Project · 14 years ago
  3. 1de4f8e am 7436fa8e: am cd3ed116: am 8d4d590d: am 1e75e972: Merge "avcenc: Update a comment about the inline assembly" by Jean-Baptiste Queru · 14 years ago
  4. a8ee31a am bceb306a: am 562d6548: am 8a825ec0: am aa411adf: Merge "h264 streaming: make profile-level-id optional" by Jean-Baptiste Queru · 14 years ago
  5. 7436fa8 am cd3ed116: am 8d4d590d: am 1e75e972: Merge "avcenc: Update a comment about the inline assembly" by Jean-Baptiste Queru · 14 years ago
  6. bceb306 am 562d6548: am 8a825ec0: am aa411adf: Merge "h264 streaming: make profile-level-id optional" by Jean-Baptiste Queru · 14 years ago
  7. cd3ed11 am 8d4d590d: am 1e75e972: Merge "avcenc: Update a comment about the inline assembly" by Jean-Baptiste Queru · 14 years ago
  8. 562d654 am 8a825ec0: am aa411adf: Merge "h264 streaming: make profile-level-id optional" by Jean-Baptiste Queru · 14 years ago
  9. 8d4d590 am 1e75e972: Merge "avcenc: Update a comment about the inline assembly" by Jean-Baptiste Queru · 14 years ago
  10. 8a825ec am aa411adf: Merge "h264 streaming: make profile-level-id optional" by Jean-Baptiste Queru · 14 years ago
  11. 1e75e97 Merge "avcenc: Update a comment about the inline assembly" by Jean-Baptiste Queru · 14 years ago
  12. aa411ad Merge "h264 streaming: make profile-level-id optional" by Jean-Baptiste Queru · 14 years ago
  13. 94c768e am 38ca35b9: am 39134889: am 41ee747f: am 5ebce52c: Merge "avcenc: Fix the gcc inline assembly constraints" by Jean-Baptiste Queru · 14 years ago
  14. d91f4d2 am d20a2d64: am 136e83a2: am 894a7e45: am 9e13e927: Merge "avcenc: Properly indent assembly blocks" by Jean-Baptiste Queru · 14 years ago
  15. 38ca35b am 39134889: am 41ee747f: am 5ebce52c: Merge "avcenc: Fix the gcc inline assembly constraints" by Jean-Baptiste Queru · 14 years ago
  16. d20a2d6 am 136e83a2: am 894a7e45: am 9e13e927: Merge "avcenc: Properly indent assembly blocks" by Jean-Baptiste Queru · 14 years ago
  17. 3913488 am 41ee747f: am 5ebce52c: Merge "avcenc: Fix the gcc inline assembly constraints" by Jean-Baptiste Queru · 14 years ago
  18. 136e83a am 894a7e45: am 9e13e927: Merge "avcenc: Properly indent assembly blocks" by Jean-Baptiste Queru · 14 years ago
  19. 41ee747 am 5ebce52c: Merge "avcenc: Fix the gcc inline assembly constraints" by Jean-Baptiste Queru · 14 years ago
  20. 894a7e4 am 9e13e927: Merge "avcenc: Properly indent assembly blocks" by Jean-Baptiste Queru · 14 years ago
  21. 5ebce52 Merge "avcenc: Fix the gcc inline assembly constraints" by Jean-Baptiste Queru · 14 years ago
  22. 9e13e92 Merge "avcenc: Properly indent assembly blocks" by Jean-Baptiste Queru · 14 years ago
  23. ddc9df0 merge in jb-mr1-release history after reset to jb-mr1-dev by The Android Automerger · 14 years ago
  24. 42d5151 avcenc: Update a comment about the inline assembly by Martin Storsjo · 14 years ago
  25. e1fbc3c am 4b3d6d88: am 164c75d4: Merge "Camera2: Add support for preview callbacks" into jb-mr1-dev by Eino-Ville Talvala · 14 years ago
  26. 4b3d6d8 am 164c75d4: Merge "Camera2: Add support for preview callbacks" into jb-mr1-dev by Eino-Ville Talvala · 14 years ago
  27. 164c75d Merge "Camera2: Add support for preview callbacks" into jb-mr1-dev by Eino-Ville Talvala · 14 years ago
  28. 228a538 Camera2: Add support for preview callbacks by Eino-Ville Talvala · 14 years ago
  29. 3fdb405 avcenc: Fix the gcc inline assembly constraints by Martin Storsjo · 14 years ago
  30. 4324ecc am d50b650e: am 6a8ea471: Merge "Revert "Swap the order of creating IAudioTrack and thread"" into jb-mr1-dev by Glenn Kasten · 14 years ago
  31. d50b650 am 6a8ea471: Merge "Revert "Swap the order of creating IAudioTrack and thread"" into jb-mr1-dev by Glenn Kasten · 14 years ago
  32. ccde125 avcenc: Properly indent assembly blocks by Martin Storsjo · 14 years ago
  33. 6a8ea47 Merge "Revert "Swap the order of creating IAudioTrack and thread"" into jb-mr1-dev by Glenn Kasten · 14 years ago
  34. 2dd96c6 am 233ac8ff: am 3411fc2f: am add7c4d3: am 46b7eeb8: Merge "hardening: eliminate text relocations from h264" by Nick Kralevich · 14 years ago
  35. 233ac8f am 3411fc2f: am add7c4d3: am 46b7eeb8: Merge "hardening: eliminate text relocations from h264" by Nick Kralevich · 14 years ago
  36. 3411fc2 am add7c4d3: am 46b7eeb8: Merge "hardening: eliminate text relocations from h264" by Nick Kralevich · 14 years ago
  37. add7c4d am 46b7eeb8: Merge "hardening: eliminate text relocations from h264" by Nick Kralevich · 14 years ago
  38. 46b7eeb Merge "hardening: eliminate text relocations from h264" by Nick Kralevich · 14 years ago
  39. 5667a75 am 9df404fa: am 11623fa3: am af5f9f05: am cd622346: Merge "MPEG2TSWriter: Fix an off-by-one in the condition for padding" by Jean-Baptiste Queru · 14 years ago
  40. 0be8279 am a002beab: am 07c6ddb4: am 3b939a5e: am 02a4ec21: Merge "avcenc: Remove a leftover define" by Jean-Baptiste Queru · 14 years ago
  41. 9df404f am 11623fa3: am af5f9f05: am cd622346: Merge "MPEG2TSWriter: Fix an off-by-one in the condition for padding" by Jean-Baptiste Queru · 14 years ago
  42. a002bea am 07c6ddb4: am 3b939a5e: am 02a4ec21: Merge "avcenc: Remove a leftover define" by Jean-Baptiste Queru · 14 years ago
  43. 11623fa am af5f9f05: am cd622346: Merge "MPEG2TSWriter: Fix an off-by-one in the condition for padding" by Jean-Baptiste Queru · 14 years ago
  44. 07c6ddb am 3b939a5e: am 02a4ec21: Merge "avcenc: Remove a leftover define" by Jean-Baptiste Queru · 14 years ago
  45. af5f9f0 am cd622346: Merge "MPEG2TSWriter: Fix an off-by-one in the condition for padding" by Jean-Baptiste Queru · 14 years ago
  46. 3b939a5 am 02a4ec21: Merge "avcenc: Remove a leftover define" by Jean-Baptiste Queru · 14 years ago
  47. cd62234 Merge "MPEG2TSWriter: Fix an off-by-one in the condition for padding" by Jean-Baptiste Queru · 14 years ago
  48. 02a4ec2 Merge "avcenc: Remove a leftover define" by Jean-Baptiste Queru · 14 years ago
  49. 9b4e856 merge in jb-mr1-release history after reset to jb-mr1-dev by The Android Automerger · 14 years ago
  50. c867a50 MPEG2TSWriter: Fix an off-by-one in the condition for padding by Martin Storsjo · 14 years ago
  51. 8033393 h264 streaming: make profile-level-id optional by Patrik2 Carlsson · 14 years ago
  52. 28786a4 am c8988ee9: am 53ae1640: Don\'t log streaming url. by James Dong · 14 years ago
  53. c8988ee am 53ae1640: Don\'t log streaming url. by James Dong · 14 years ago
  54. 53ae164 Don't log streaming url. by James Dong · 14 years ago
  55. 0a1b2ae avcenc: Remove a leftover define by Martin Storsjo · 14 years ago
  56. e469b59 am 4d1ca6fb: (-s ours) Reconcile with jb-mr1-release - do not merge by The Android Open Source Project · 14 years ago
  57. 4d1ca6f Reconcile with jb-mr1-release - do not merge by The Android Open Source Project · 14 years ago
  58. 7f8be6a am 1bfad87c: am 02d3c328: am 523c09d5: am 64b3fe55: Merge "stagefright amrnb: Remove unused leftover source files" by Jean-Baptiste Queru · 14 years ago
  59. 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
  60. 1bfad87 am 02d3c328: am 523c09d5: am 64b3fe55: Merge "stagefright amrnb: Remove unused leftover source files" by Jean-Baptiste Queru · 14 years ago
  61. 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
  62. 02d3c32 am 523c09d5: am 64b3fe55: Merge "stagefright amrnb: Remove unused leftover source files" by Jean-Baptiste Queru · 14 years ago
  63. 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
  64. 523c09d am 64b3fe55: Merge "stagefright amrnb: Remove unused leftover source files" by Jean-Baptiste Queru · 14 years ago
  65. f20e4ad am c1d2777c: Merge "stagefright amrnb: Move the bitstream_format enum into frame_type_3gpp.h" by Jean-Baptiste Queru · 14 years ago
  66. fcae215 am 9b9b8a9e: am 08ebb6b1: Merge "Camera2: Fix SCENE_MODE" into jb-mr1-dev by Eino-Ville Talvala · 14 years ago
  67. 9b9b8a9 am 08ebb6b1: Merge "Camera2: Fix SCENE_MODE" into jb-mr1-dev by Eino-Ville Talvala · 14 years ago
  68. 08ebb6b Merge "Camera2: Fix SCENE_MODE" into jb-mr1-dev by Eino-Ville Talvala · 14 years ago
  69. 3cc8979 Camera2: Fix SCENE_MODE by Eino-Ville Talvala · 14 years ago
  70. 64b3fe5 Merge "stagefright amrnb: Remove unused leftover source files" by Jean-Baptiste Queru · 14 years ago
  71. c1d2777 Merge "stagefright amrnb: Move the bitstream_format enum into frame_type_3gpp.h" by Jean-Baptiste Queru · 14 years ago
  72. 3f4e81f am 1fd11507: am 7df98f17: am 0df213ba: am dde79acf: Merge "hardening: eliminate text relocations from mp3" by Jean-Baptiste Queru · 14 years ago
  73. 12c750d am 120462a9: am 1a42aee5: am a109e9d5: am b7ca7dc9: Merge "avcenc: Clarify the ifdefs surrounding inline assembly" by Jean-Baptiste Queru · 14 years ago
  74. d37ade3 am 706f36c7: am 9bd763d1: am fba9d50d: am 4f981882: Merge "hardening: eliminate text relocations from amrwb" by Jean-Baptiste Queru · 14 years ago
  75. 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
  76. 7db4468 am 2f72739b: am fa172b0d: am eeb9fde0: am 3f5d2e17: Merge "aacenc/amrwbenc: Remove unused and dubious typedefs" by Jean-Baptiste Queru · 14 years ago
  77. 1fd1150 am 7df98f17: am 0df213ba: am dde79acf: Merge "hardening: eliminate text relocations from mp3" by Jean-Baptiste Queru · 14 years ago
  78. 120462a am 1a42aee5: am a109e9d5: am b7ca7dc9: Merge "avcenc: Clarify the ifdefs surrounding inline assembly" by Jean-Baptiste Queru · 14 years ago
  79. 706f36c am 9bd763d1: am fba9d50d: am 4f981882: Merge "hardening: eliminate text relocations from amrwb" by Jean-Baptiste Queru · 14 years ago
  80. a83ec8c am f365fecf: am 1191287b: am c3bfa026: Merge "aacenc/amrwbenc: Remove the now unused LINUX define" by Jean-Baptiste Queru · 14 years ago
  81. 2f72739 am fa172b0d: am eeb9fde0: am 3f5d2e17: Merge "aacenc/amrwbenc: Remove unused and dubious typedefs" by Jean-Baptiste Queru · 14 years ago
  82. 7df98f1 am 0df213ba: am dde79acf: Merge "hardening: eliminate text relocations from mp3" by Jean-Baptiste Queru · 14 years ago
  83. 1a42aee am a109e9d5: am b7ca7dc9: Merge "avcenc: Clarify the ifdefs surrounding inline assembly" by Jean-Baptiste Queru · 14 years ago
  84. 9bd763d am fba9d50d: am 4f981882: Merge "hardening: eliminate text relocations from amrwb" by Jean-Baptiste Queru · 14 years ago
  85. f365fec am 1191287b: am c3bfa026: Merge "aacenc/amrwbenc: Remove the now unused LINUX define" by Jean-Baptiste Queru · 14 years ago
  86. fa172b0 am eeb9fde0: am 3f5d2e17: Merge "aacenc/amrwbenc: Remove unused and dubious typedefs" by Jean-Baptiste Queru · 14 years ago
  87. 0df213b am dde79acf: Merge "hardening: eliminate text relocations from mp3" by Jean-Baptiste Queru · 14 years ago
  88. a109e9d am b7ca7dc9: Merge "avcenc: Clarify the ifdefs surrounding inline assembly" by Jean-Baptiste Queru · 14 years ago
  89. fba9d50 am 4f981882: Merge "hardening: eliminate text relocations from amrwb" by Jean-Baptiste Queru · 14 years ago
  90. 1191287 am c3bfa026: Merge "aacenc/amrwbenc: Remove the now unused LINUX define" by Jean-Baptiste Queru · 14 years ago
  91. eeb9fde am 3f5d2e17: Merge "aacenc/amrwbenc: Remove unused and dubious typedefs" by Jean-Baptiste Queru · 14 years ago
  92. dde79ac Merge "hardening: eliminate text relocations from mp3" by Jean-Baptiste Queru · 14 years ago
  93. b7ca7dc Merge "avcenc: Clarify the ifdefs surrounding inline assembly" by Jean-Baptiste Queru · 14 years ago
  94. 4f98188 Merge "hardening: eliminate text relocations from amrwb" by Jean-Baptiste Queru · 14 years ago
  95. c3bfa02 Merge "aacenc/amrwbenc: Remove the now unused LINUX define" by Jean-Baptiste Queru · 14 years ago
  96. 3f5d2e1 Merge "aacenc/amrwbenc: Remove unused and dubious typedefs" by Jean-Baptiste Queru · 14 years ago
  97. 2ce2552 merge in jb-mr1-release history after reset to jb-mr1-dev by The Android Automerger · 14 years ago
  98. fef71ef aacenc/amrwbenc: Remove the now unused LINUX define by Martin Storsjo · 15 years ago
  99. adee070 aacenc/amrwbenc: Remove unused and dubious typedefs by Martin Storsjo · 15 years ago
  100. 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