| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | resolved conflicts for merge of cf79c7a5 to master | Ying Wang | 2014-05-08 | 2 | -11/+0 |
| |\ | |||||
| | * | am 02483465: am 1d2909b3: Merge "Remove unused LOCAL_LDLIBS." | Ying Wang | 2014-05-08 | 6 | -27/+0 |
| | |\ | |||||
| | | * | am 1d2909b3: Merge "Remove unused LOCAL_LDLIBS." | Ying Wang | 2014-05-08 | 6 | -27/+0 |
| | | |\ | |||||
| | | | * | Merge "Remove unused LOCAL_LDLIBS." | Ying Wang | 2014-05-08 | 6 | -27/+0 |
| | | | |\ | |||||
| | | | | * | Remove unused LOCAL_LDLIBS. | Ying Wang | 2014-05-08 | 6 | -27/+0 |
| | | | |/ | |||||
| * | | | | Merge "Add client side support for more AUDIO_FORMAT_PCM_*" | Glenn Kasten | 2014-05-08 | 2 | -9/+22 |
| |\ \ \ \ | |||||
| | * | | | | Add client side support for more AUDIO_FORMAT_PCM_* | Glenn Kasten | 2014-05-07 | 2 | -9/+22 |
| * | | | | | Merge "Make AMediaCodec_create* APIs more like their Java counterparts" | Marco Nelissen | 2014-05-08 | 2 | -11/+16 |
| |\ \ \ \ \ | |||||
| | * | | | | | Make AMediaCodec_create* APIs more like their Java counterparts | Marco Nelissen | 2014-05-08 | 2 | -11/+16 |
| * | | | | | | Merge "Add a per-thread heap that is read-only to clients" | Glenn Kasten | 2014-05-08 | 2 | -0/+19 |
| |\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| | * | | | | | Add a per-thread heap that is read-only to clients | Glenn Kasten | 2014-05-07 | 2 | -0/+19 |
| * | | | | | | Merge "audio policy: cleanup AudioPolicyService destructor" | Eric Laurent | 2014-05-08 | 1 | -3/+1 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | audio policy: cleanup AudioPolicyService destructor | Eric Laurent | 2014-05-07 | 1 | -3/+1 |
| * | | | | | | | Merge "Expand AMediaFormat" | Marco Nelissen | 2014-05-07 | 2 | -12/+64 |
| |\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | |||||
| | * | | | | | | Expand AMediaFormat | Marco Nelissen | 2014-05-07 | 2 | -12/+64 |
| * | | | | | | | Merge "Add NDK version of MediaMuxer" | Marco Nelissen | 2014-05-07 | 7 | -5/+180 |
| |\ \ \ \ \ \ \ | |/ / / / / / | |||||
| | * | | | | | | Add NDK version of MediaMuxer | Marco Nelissen | 2014-05-07 | 7 | -5/+180 |
| | | |/ / / / | |/| | | | | |||||
| * | | | | | | Merge "Fix a couple of fast capture typo bugs" | Glenn Kasten | 2014-05-07 | 2 | -4/+4 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Fix a couple of fast capture typo bugs | Glenn Kasten | 2014-05-07 | 2 | -4/+4 |
| | |/ / / / / | |||||
| * | | | | | | Merge "Remove legacy omx_message variables" | Andy Hung | 2014-05-07 | 4 | -52/+12 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Remove legacy omx_message variables | Andy Hung | 2014-05-06 | 4 | -52/+12 |
| * | | | | | | | audio policy: fix typo in AudioPolicyManager constructor | Eric Laurent | 2014-05-07 | 1 | -6/+6 |
| | |_|/ / / / |/| | | | | | |||||
| * | | | | | | Merge "audio policy: update from libhardware_legacy" | Eric Laurent | 2014-05-07 | 2 | -108/+349 |
| |\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| | * | | | | | audio policy: update from libhardware_legacy | Eric Laurent | 2014-05-06 | 2 | -108/+349 |
| | |/ / / / | |||||
| * | | | | | Merge "MediaFormat owns its strings" | Marco Nelissen | 2014-05-06 | 2 | -4/+19 |
| |\ \ \ \ \ | |||||
| | * | | | | | MediaFormat owns its strings | Marco Nelissen | 2014-05-06 | 2 | -4/+19 |
| * | | | | | | Merge "Camera3: fix missing string in logging code" | Zhijun He | 2014-05-06 | 1 | -1/+1 |
| |\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| | * | | | | | Camera3: fix missing string in logging code | Zhijun He | 2014-05-06 | 1 | -1/+1 |
| * | | | | | | am 71171988: am f655acf1: am 8fb04d47: Merge "Fix memory leak when filtering ... | Eric Laurent | 2014-05-06 | 2 | -10/+27 |
| |\ \ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| | * | | | | | am f655acf1: am 8fb04d47: Merge "Fix memory leak when filtering commands in i... | Eric Laurent | 2014-05-06 | 2 | -10/+27 |
| | |\ \ \ \ \ | | | |_|/ / | | |/| | | | |||||
| | | * | | | | am 8fb04d47: Merge "Fix memory leak when filtering commands in insertCommand_... | Eric Laurent | 2014-05-06 | 2 | -10/+27 |
| | | |\ \ \ \ | | | | |_|/ | | | |/| | | |||||
| | | | * | | | Merge "Fix memory leak when filtering commands in insertCommand_l()" | Eric Laurent | 2014-05-06 | 2 | -10/+27 |
| | | | |\ \ \ | |||||
| | | | | * | | | Fix memory leak when filtering commands in insertCommand_l() | Jesper Tragardh | 2014-04-11 | 2 | -10/+27 |
| * | | | | | | | Merge "Remove warnings in recordvideo" | Andy Hung | 2014-05-06 | 1 | -5/+9 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Remove warnings in recordvideo | Andy Hung | 2014-05-05 | 1 | -5/+9 |
| * | | | | | | | | Merge "Fix audioloop test program" | Andy Hung | 2014-05-06 | 1 | -62/+108 |
| |\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | / | |_|_|_|_|_|/ |/| | | | | | | |||||
| | * | | | | | | Fix audioloop test program | Andy Hung | 2014-05-05 | 1 | -62/+108 |
| * | | | | | | | Merge "Don't build libmediandk for PDK" | Marco Nelissen | 2014-05-05 | 1 | -1/+5 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Don't build libmediandk for PDK | Marco Nelissen | 2014-05-05 | 1 | -1/+5 |
| * | | | | | | | | Merge "WIP: MediaCodec and friends NDK APIs, plain C version" | Marco Nelissen | 2014-05-05 | 8 | -0/+1066 |
| |\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| | * | | | | | | | WIP: MediaCodec and friends NDK APIs, plain C version | Marco Nelissen | 2014-05-05 | 8 | -0/+1066 |
| | | |_|_|_|_|/ | |/| | | | | | |||||
| * | | | | | | | Merge "Use audio_is_linear_pcm()" | Glenn Kasten | 2014-05-05 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Use audio_is_linear_pcm() | Glenn Kasten | 2014-05-02 | 1 | -2/+2 |
| * | | | | | | | | Merge "camera3: Update CameraMetadata vendor tag handling." | Ruben Brunk | 2014-05-05 | 4 | -15/+192 |
| |\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | |||||
| | * | | | | | | | camera3: Update CameraMetadata vendor tag handling. | Ruben Brunk | 2014-05-02 | 4 | -15/+192 |
| | | |/ / / / / | |/| | | | | | |||||
| * | | | | | | | Merge "NULL check in ConnectPro" | Natalie Silvanovich | 2014-05-05 | 1 | -0/+5 |
| |\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| | * | | | | | | NULL check in ConnectPro | Natalie Silvanovich | 2014-05-05 | 1 | -0/+5 |
| * | | | | | | | Merge "Revert "camera3: Update CameraMetadata vendor tag handling."" | Ruben Brunk | 2014-05-03 | 4 | -191/+14 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Revert "camera3: Update CameraMetadata vendor tag handling." | Ruben Brunk | 2014-05-03 | 4 | -191/+14 |
| * | | | | | | | | Merge "camera3: Update CameraMetadata vendor tag handling." | Ruben Brunk | 2014-05-02 | 4 | -14/+191 |
| |\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
 |
index : frameworks_av.git | |
| frameworks/av | git repository hosting |
| summaryrefslogtreecommitdiffstats |