| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | resolved conflicts for merge of 3c780188 to master | Glenn Kasten | 2014-03-14 | 5 | -0/+8 |
| |\ | |||||
| | * | am 089affb6: Merge "mediaserver and associated services are 32-bit only" | Glenn Kasten | 2014-03-14 | 6 | -0/+10 |
| | |\ | |||||
| | | * | Merge "mediaserver and associated services are 32-bit only" | Glenn Kasten | 2014-03-14 | 6 | -0/+10 |
| | | |\ | |||||
| | | | * | mediaserver and associated services are 32-bit only | Glenn Kasten | 2014-03-12 | 6 | -0/+10 |
| * | | | | 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 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 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 |
| | * | | | | | | 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 a671f943: am c69bc40a: Merge "Cap pts gap between adjacent frames to speci... | Chong Zhang | 2014-03-13 | 4 | -6/+167 |
| | |\ \ \ \ \ \ | | |/ / / / / | |||||
| | | * | | | | | am c69bc40a: Merge "Cap pts gap between adjacent frames to specified value" i... | Chong Zhang | 2014-03-13 | 4 | -6/+167 |
| | | |\ \ \ \ \ | | | |/ / / / | |||||
| | | | * | | | | Merge "Cap pts gap between adjacent frames to specified value" into klp-dev | Chong Zhang | 2014-03-11 | 4 | -6/+167 |
| | | | |\ \ \ \ | |||||
| | | | | * | | | | Cap pts gap between adjacent frames to specified value | Chong Zhang | 2014-03-11 | 4 | -6/+167 |
| | | | | |/ / / | |||||
| | * | | | | | | 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 | 9 | -229/+640 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | NuPlayer: use MediaCodec instead of ACodec | Lajos Molnar | 2014-03-10 | 4 | -108/+446 |
| | * | | | | | | MediaCodec: add getInputFormat() method | Lajos Molnar | 2014-03-10 | 3 | -81/+194 |
| | * | | | | | | Revert "NuPlayer: Use a software renderer when using software codecs" | Lajos Molnar | 2014-03-10 | 4 | -42/+2 |
| * | | | | | | | Merge "mediaplayer: keep more buffers with the BufferQueue" | Lajos Molnar | 2014-03-13 | 2 | -30/+55 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | mediaplayer: keep more buffers with the BufferQueue | Lajos Molnar | 2014-03-11 | 2 | -30/+55 |
| * | | | | | | | | 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 |
| | |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | | | |||||
| | | * | | | | | | Remove streaming URI from default logs | David Williams | 2014-03-10 | 5 | -6/+5 |
| | * | | | | | | | am 38efe8eb: am 6db20dcb: Merge "AudioTrack: When paused, return cached playb... | Eric Laurent | 2014-03-08 | 1 | -3/+22 |
| | |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | | | |||||
| | | * | | | | | | am 6db20dcb: Merge "AudioTrack: When paused, return cached playback position"... | Eric Laurent | 2014-03-08 | 1 | -3/+22 |
| | | |\ \ \ \ \ \ | | | | |_|_|/ / | | | |/| | | | | |||||
| | | | * | | | | | Merge "AudioTrack: When paused, return cached playback position" into klp-dev | Eric Laurent | 2014-03-08 | 1 | -3/+22 |
| | | | |\ \ \ \ \ | |||||
| | | | | * | | | | | AudioTrack: When paused, return cached playback position | Haynes Mathew George | 2014-03-06 | 1 | -3/+22 |
| | * | | | | | | | | am 4ee774f3: am 2f55c2c0: Merge "Simplify AudioTrack stream end and fix race"... | Glenn Kasten | 2014-03-07 | 1 | -17/+15 |
| | |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |||||
| | | * | | | | | | | am 2f55c2c0: Merge "Simplify AudioTrack stream end and fix race" into klp-dev | Glenn Kasten | 2014-03-07 | 1 | -17/+15 |
| | | |\ \ \ \ \ \ \ | | | |/ / / / / / | |||||
| | | | * | | | | | | Merge "Simplify AudioTrack stream end and fix race" into klp-dev | Glenn Kasten | 2014-03-07 | 1 | -17/+15 |
| | | | |\ \ \ \ \ \ | |||||
| | | | | * | | | | | | Simplify AudioTrack stream end and fix race | Glenn Kasten | 2014-03-07 | 1 | -17/+15 |
| | * | | | | | | | | | am 4293011d: am 5874615f: Allow for larger codec private data | Marco Nelissen | 2014-03-07 | 1 | -30/+50 |
| | |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |||||
| | | * | | | | | | | | am 5874615f: Allow for larger codec private data | Marco Nelissen | 2014-03-07 | 1 | -30/+50 |
| | | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | |||||
| | | | * | | | | | | | Allow for larger codec private data | Marco Nelissen | 2014-03-07 | 1 | -30/+50 |
| | | | |/ / / / / / | |||||
| | | | * | | | | | | Merge "Fix SIGABRT when playing mp4 file" into klp-dev | Marco Nelissen | 2014-03-07 | 1 | -0/+6 |
| | | | |\ \ \ \ \ \ | |||||
| | | | | * | | | | | | Fix SIGABRT when playing mp4 file | Marco Nelissen | 2014-03-06 | 1 | -0/+6 |
| * | | | | | | | | | | Merge "MTP: Add support for device property changed events" | Mike Lockwood | 2014-03-12 | 3 | -2/+9 |
| |\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | | | |||||
 |
index : frameworks_av.git | |
| frameworks/av | git repository hosting |
| summaryrefslogtreecommitdiffstats |