summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am 089affb6: Merge "mediaserver and associated services are 32-bit only"Glenn Kasten2014-03-1414-0/+38
|\
| * Merge "mediaserver and associated services are 32-bit only"Glenn Kasten2014-03-1414-0/+38
| |\
| | * mediaserver and associated services are 32-bit onlyGlenn Kasten2014-03-1214-0/+38
* | | am 4a67fc49: Merge "Implemented support for RTSP 301 Redirect"Andreas Huber2014-03-141-11/+22
|\ \ \ | |/ /
| * | Merge "Implemented support for RTSP 301 Redirect"Andreas Huber2014-03-141-11/+22
| |\ \ | | |/ | |/|
| | * Implemented support for RTSP 301 RedirectDavid Williams2012-12-031-11/+22
* | | am 70cc5bdc: Merge changes Ic46e3069,Idc92716b into klp-devLajos Molnar2014-03-142-1/+2
|\ \ \
| * \ \ Merge changes Ic46e3069,Idc92716b into klp-devLajos Molnar2014-03-122-1/+2
| |\ \ \
| | * | | LiveSession: fix incorrect stream key (subtitle"s")Robert Shih2014-03-111-1/+1
| | * | | M3UParser: trim spaces when parsing comma separated codecs.Robert Shih2014-03-111-0/+1
* | | | | am 67a10c52: Merge "httplive: clear access units before returning from seekTo...Lajos Molnar2014-03-144-15/+42
|\ \ \ \ \ | |/ / / /
| * | | | Merge "httplive: clear access units before returning from seekTo." into klp-devLajos Molnar2014-03-124-15/+42
| |\ \ \ \ | | |/ / /
| | * | | httplive: clear access units before returning from seekTo.Robert Shih2014-03-114-15/+42
* | | | | am cf49a51f: fix codec buffer leak in error handling when timestamp goes back...Chong Zhang2014-03-141-7/+7
|\ \ \ \ \ | |/ / / /
| * | | | fix codec buffer leak in error handling when timestamp goes backwardChong Zhang2014-03-111-7/+7
* | | | | am c69bc40a: Merge "Cap pts gap between adjacent frames to specified value" i...Chong Zhang2014-03-136-6/+169
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Cap pts gap between adjacent frames to specified value" into klp-devChong Zhang2014-03-116-6/+169
| |\ \ \ \
| | * | | | Cap pts gap between adjacent frames to specified valueChong Zhang2014-03-116-6/+169
| | |/ / /
* | | | | am 1c608ab3: save mGraphicBuffer pointer even when we\'re suspendedChong Zhang2014-03-131-0/+6
|\ \ \ \ \ | |/ / / /
| * | | | save mGraphicBuffer pointer even when we're suspendedChong Zhang2014-03-111-0/+6
| |/ / /
* | | | am 19afb386: Merge "Remove streaming URI from default logs"Marco Nelissen2014-03-135-6/+5
|\ \ \ \ | | |/ / | |/| |
| * | | Merge "Remove streaming URI from default logs"Marco Nelissen2014-03-125-6/+5
| |\ \ \
| | * | | Remove streaming URI from default logsDavid Williams2014-03-105-6/+5
| |/ / /
* | | | am 2ad7af29: Merge "Check for ARCH_ARM_HAVE_NEON flag only for ARM arch"Narayan Kamath2014-03-112-4/+7
|\ \ \ \ | |/ / /
| * | | Merge "Check for ARCH_ARM_HAVE_NEON flag only for ARM arch"Narayan Kamath2014-03-072-4/+7
| |\ \ \
| | * | | Check for ARCH_ARM_HAVE_NEON flag only for ARM archAshok Bhat2014-03-032-4/+7
* | | | | am a9b82160: Merge "LP64 fixes for media/libeffects"Narayan Kamath2014-03-1114-61/+62
|\ \ \ \ \ | |/ / / /
| * | | | Merge "LP64 fixes for media/libeffects"Narayan Kamath2014-03-0714-61/+62
| |\ \ \ \
| | * | | | LP64 fixes for media/libeffectsAshok Bhat2014-02-2014-61/+62
* | | | | | am 395c2fc0: Merge "audioflinger: Fix for a deadlock in track creation"Glenn Kasten2014-03-110-0/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "audioflinger: Fix for a deadlock in track creation"Glenn Kasten2014-03-062-2/+5
| |\ \ \ \ \
| | * | | | | audioflinger: Fix for a deadlock in track creationHaynes Mathew George2014-03-062-2/+5
| |/ / / / /
* | | | | | am 525b099a: Merge "Fix ALOGVs for 64bit"Narayan Kamath2014-03-112-4/+4
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Fix ALOGVs for 64bit"Narayan Kamath2014-03-032-4/+4
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Fix ALOGVs for 64bitKévin PETIT2014-02-282-4/+4
* | | | | | am 0cf16339: Merge "Fix preventing from heap overwrite in capture command"Glenn Kasten2014-03-111-34/+35
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Fix preventing from heap overwrite in capture command"Glenn Kasten2014-02-281-34/+35
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Fix preventing from heap overwrite in capture commandRyszard Grzesica2014-02-201-34/+35
| | |/ / /
* | | | | am 096d72a3: Merge "AArch64: Correction for LP64"Narayan Kamath2014-03-111-5/+5
|\ \ \ \ \ | |/ / / /
| * | | | Merge "AArch64: Correction for LP64"Narayan Kamath2014-02-271-5/+5
| |\ \ \ \
| | * | | | AArch64: Correction for LP64Marcus Oakland2014-02-261-5/+5
* | | | | | am 5969b408: Merge "Use multilib-friendly LOCAL_MODULE_RELATIVE_PATH"Ying Wang2014-03-111-1/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Use multilib-friendly LOCAL_MODULE_RELATIVE_PATH"Ying Wang2014-02-261-1/+2
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Use multilib-friendly LOCAL_MODULE_RELATIVE_PATHYing Wang2014-02-261-1/+2
| |/ / / /
* | | | | am 8fc4d57d: Merge "Avoid a building error"Glenn Kasten2014-03-111-1/+3
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Avoid a building error"Glenn Kasten2014-02-251-1/+3
| |\ \ \ \
| | * | | | Avoid a building errorChih-Wei Huang2013-01-101-1/+3
* | | | | | am bc69c8ba: DO NOT MERGE: Camera: delete preview callback when preview size ...Zhijun He2014-03-101-0/+16
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | DO NOT MERGE: Camera: delete preview callback when preview size is changedZhijun He2014-03-101-0/+16
* | | | | | am 6db20dcb: Merge "AudioTrack: When paused, return cached playback position"...Eric Laurent2014-03-082-3/+23
|\ \ \ \ \ \ | |/ / / / /