| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | resolved conflicts for merge of 3c780188 to master | Glenn Kasten | 2014-03-14 | 13 | -0/+36 |
| |\ | |||||
| | * | am 089affb6: Merge "mediaserver and associated services are 32-bit only" | Glenn Kasten | 2014-03-14 | 14 | -0/+38 |
| | |\ | |||||
| | | * | Merge "mediaserver and associated services are 32-bit only" | Glenn Kasten | 2014-03-14 | 14 | -0/+38 |
| | | |\ | |||||
| | | | * | mediaserver and associated services are 32-bit only | Glenn Kasten | 2014-03-12 | 14 | -0/+38 |
| * | | | | am f1ac623f: am 4a67fc49: Merge "Implemented support for RTSP 301 Redirect" | Andreas Huber | 2014-03-14 | 1 | -11/+22 |
| |\ \ \ \ | |/ / / | |||||
| | * | | | am 4a67fc49: Merge "Implemented support for RTSP 301 Redirect" | Andreas Huber | 2014-03-14 | 1 | -11/+22 |
| | |\ \ \ | | |/ / | |||||
| | | * | | Merge "Implemented support for RTSP 301 Redirect" | Andreas Huber | 2014-03-14 | 1 | -11/+22 |
| | | |\ \ | | | |/ | | |/| | |||||
| | | | * | Implemented support for RTSP 301 Redirect | David Williams | 2012-12-03 | 1 | -11/+22 |
| * | | | | am fa243e07: am 466786b2: am 70cc5bdc: Merge changes Ic46e3069,Idc92716b into... | Lajos Molnar | 2014-03-14 | 0 | -0/+0 |
| |\ \ \ \ | |/ / / | |||||
| | * | | | am 466786b2: am 70cc5bdc: Merge changes Ic46e3069,Idc92716b into klp-dev | Lajos Molnar | 2014-03-14 | 2 | -1/+2 |
| | |\ \ \ | |||||
| | | * \ \ | am 70cc5bdc: Merge changes Ic46e3069,Idc92716b into klp-dev | Lajos Molnar | 2014-03-14 | 2 | -1/+2 |
| | | |\ \ \ | |||||
| | | | * \ \ | Merge changes Ic46e3069,Idc92716b into klp-dev | Lajos Molnar | 2014-03-12 | 2 | -1/+2 |
| | | | |\ \ \ | |||||
| | | | | * | | | LiveSession: fix incorrect stream key (subtitle"s") | Robert Shih | 2014-03-11 | 1 | -1/+1 |
| | | | | * | | | M3UParser: trim spaces when parsing comma separated codecs. | Robert Shih | 2014-03-11 | 1 | -0/+1 |
| * | | | | | | | am a0b94395: (-s ours) am 5b297ba7: am 67a10c52: Merge "httplive: clear acces... | Lajos Molnar | 2014-03-14 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ | |/ / / / / / | |||||
| | * | | | | | | am 5b297ba7: am 67a10c52: Merge "httplive: clear access units before returnin... | Lajos Molnar | 2014-03-14 | 4 | -15/+42 |
| | |\ \ \ \ \ \ | | |/ / / / / | |||||
| | | * | | | | | am 67a10c52: Merge "httplive: clear access units before returning from seekTo... | Lajos Molnar | 2014-03-14 | 4 | -15/+42 |
| | | |\ \ \ \ \ | | | |/ / / / | |||||
| | | | * | | | | Merge "httplive: clear access units before returning from seekTo." into klp-dev | Lajos Molnar | 2014-03-12 | 4 | -15/+42 |
| | | | |\ \ \ \ | | | | |/ / / | |||||
| | | | | * | | | httplive: clear access units before returning from seekTo. | Robert Shih | 2014-03-11 | 4 | -15/+42 |
| * | | | | | | | Merge "Fix Offload playback in AudioFlinger" | Andy Hung | 2014-03-14 | 1 | -2/+3 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Fix Offload playback in AudioFlinger | Andy Hung | 2014-03-13 | 1 | -2/+3 |
| * | | | | | | | | Merge "Revert "Revert "Convert AudioFlinger mSinkBuffer to flexible format""" | Andy Hung | 2014-03-14 | 2 | -22/+41 |
| |\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| | * | | | | | | | Revert "Revert "Convert AudioFlinger mSinkBuffer to flexible format"" | Andy Hung | 2014-03-13 | 2 | -22/+41 |
| * | | | | | | | | am 43d3f40b: am bd77a1b5: am cf49a51f: fix codec buffer leak in error handlin... | Chong Zhang | 2014-03-14 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||||
| | * | | | | | | | am bd77a1b5: am cf49a51f: fix codec buffer leak in error handling when timest... | Chong Zhang | 2014-03-13 | 1 | -7/+7 |
| | |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | |||||
| | | * | | | | | | am cf49a51f: fix codec buffer leak in error handling when timestamp goes back... | Chong Zhang | 2014-03-13 | 1 | -7/+7 |
| | | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | | | |||||
| | | | * | | | | | fix codec buffer leak in error handling when timestamp goes backward | Chong Zhang | 2014-03-11 | 1 | -7/+7 |
| * | | | | | | | | am 29c291f2: (-s ours) am a671f943: am c69bc40a: Merge "Cap pts gap between a... | Chong Zhang | 2014-03-14 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| | * | | | | | | | am a671f943: am c69bc40a: Merge "Cap pts gap between adjacent frames to speci... | Chong Zhang | 2014-03-13 | 6 | -6/+169 |
| | |\ \ \ \ \ \ \ | | |/ / / / / / | |||||
| | | * | | | | | | am c69bc40a: Merge "Cap pts gap between adjacent frames to specified value" i... | Chong Zhang | 2014-03-13 | 6 | -6/+169 |
| | | |\ \ \ \ \ \ | | | |/ / / / / | |||||
| | | | * | | | | | Merge "Cap pts gap between adjacent frames to specified value" into klp-dev | Chong Zhang | 2014-03-11 | 6 | -6/+169 |
| | | | |\ \ \ \ \ | |||||
| | | | | * | | | | | Cap pts gap between adjacent frames to specified value | Chong Zhang | 2014-03-11 | 6 | -6/+169 |
| | | | | | |/ / / | | | | |/| | | | |||||
| * | | | | | | | | resolved conflicts for merge of 28836548 to master | Chong Zhang | 2014-03-14 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| | * | | | | | | | am 1e001f92: am 1c608ab3: save mGraphicBuffer pointer even when we\'re suspended | Chong Zhang | 2014-03-13 | 1 | -0/+6 |
| | |\ \ \ \ \ \ \ | | |/ / / / / / | |||||
| | | * | | | | | | am 1c608ab3: save mGraphicBuffer pointer even when we\'re suspended | Chong Zhang | 2014-03-13 | 1 | -0/+6 |
| | | |\ \ \ \ \ \ | | | |/ / / / / | |||||
| | | | * | | | | | save mGraphicBuffer pointer even when we're suspended | Chong Zhang | 2014-03-11 | 1 | -0/+6 |
| | | | |/ / / / | |||||
| * | | | | | | | Merge changes I1455bfc6,I90c7e34b,I06e001df | Lajos Molnar | 2014-03-14 | 11 | -232/+646 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | NuPlayer: use MediaCodec instead of ACodec | Lajos Molnar | 2014-03-10 | 4 | -108/+446 |
| | * | | | | | | | MediaCodec: add getInputFormat() method | Lajos Molnar | 2014-03-10 | 5 | -84/+200 |
| | * | | | | | | | Revert "NuPlayer: Use a software renderer when using software codecs" | Lajos Molnar | 2014-03-10 | 4 | -42/+2 |
| * | | | | | | | | Merge "camera3: Pass vendor tags through binder." | Ruben Brunk | 2014-03-13 | 12 | -49/+829 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | camera3: Pass vendor tags through binder. | Ruben Brunk | 2014-03-13 | 12 | -49/+829 |
| * | | | | | | | | | Merge "mediaplayer: keep more buffers with the BufferQueue" | Lajos Molnar | 2014-03-13 | 3 | -30/+56 |
| |\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | | | |||||
| | * | | | | | | | | mediaplayer: keep more buffers with the BufferQueue | Lajos Molnar | 2014-03-11 | 3 | -30/+56 |
| * | | | | | | | | | Revert "Convert AudioFlinger mSinkBuffer to flexible format" | Eric Laurent | 2014-03-13 | 2 | -41/+22 |
| * | | | | | | | | | am f4431278: am 19afb386: Merge "Remove streaming URI from default logs" | Marco Nelissen | 2014-03-12 | 5 | -6/+5 |
| |\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | | |||||
| | * | | | | | | | | am 19afb386: Merge "Remove streaming URI from default logs" | Marco Nelissen | 2014-03-12 | 5 | -6/+5 |
| | |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | | | |||||
| | | * | | | | | | | Merge "Remove streaming URI from default logs" | Marco Nelissen | 2014-03-12 | 5 | -6/+5 |
| | | |\ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | Remove streaming URI from default logs | David Williams | 2014-03-10 | 5 | -6/+5 |
| | | |/ / / / / / / | |||||
| * | | | | | | | | | am 708601d0: (-s ours) am f0fb921c: am bc69c8ba: DO NOT MERGE: Camera: delete... | Zhijun He | 2014-03-12 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
 |
index : frameworks_av.git | |
| frameworks/av | git repository hosting |
| summaryrefslogtreecommitdiffstats |