summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* am 089affb6: Merge "mediaserver and associated services are 32-bit only"Glenn Kasten2014-03-146-0/+10
|\
| * Merge "mediaserver and associated services are 32-bit only"Glenn Kasten2014-03-146-0/+10
| |\
| | * mediaserver and associated services are 32-bit onlyGlenn Kasten2014-03-126-0/+10
* | | 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 466786b2: am 70cc5bdc: Merge changes Ic46e3069,Idc92716b into klp-devLajos Molnar2014-03-142-1/+2
|\ \ \
| * \ \ 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 5b297ba7: am 67a10c52: Merge "httplive: clear access units before returnin...Lajos Molnar2014-03-144-15/+42
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 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 bd77a1b5: am cf49a51f: fix codec buffer leak in error handling when timest...Chong Zhang2014-03-131-7/+7
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am cf49a51f: fix codec buffer leak in error handling when timestamp goes back...Chong Zhang2014-03-131-7/+7
| |\ \ \ \ \ | | |/ / / /
| | * | | | fix codec buffer leak in error handling when timestamp goes backwardChong Zhang2014-03-111-7/+7
* | | | | | am a671f943: am c69bc40a: Merge "Cap pts gap between adjacent frames to speci...Chong Zhang2014-03-134-6/+167
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am c69bc40a: Merge "Cap pts gap between adjacent frames to specified value" i...Chong Zhang2014-03-134-6/+167
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "Cap pts gap between adjacent frames to specified value" into klp-devChong Zhang2014-03-114-6/+167
| | |\ \ \ \
| | | * | | | Cap pts gap between adjacent frames to specified valueChong Zhang2014-03-114-6/+167
| | | |/ / /
* | | | | | am 1e001f92: am 1c608ab3: save mGraphicBuffer pointer even when we\'re suspendedChong Zhang2014-03-131-0/+6
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 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-125-6/+5
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Remove streaming URI from default logsDavid Williams2014-03-105-6/+5
* | | | | am 38efe8eb: am 6db20dcb: Merge "AudioTrack: When paused, return cached playb...Eric Laurent2014-03-081-3/+22
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | am 6db20dcb: Merge "AudioTrack: When paused, return cached playback position"...Eric Laurent2014-03-081-3/+22
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Merge "AudioTrack: When paused, return cached playback position" into klp-devEric Laurent2014-03-081-3/+22
| | |\ \ \
| | | * | | AudioTrack: When paused, return cached playback positionHaynes Mathew George2014-03-061-3/+22
* | | | | | am 4ee774f3: am 2f55c2c0: Merge "Simplify AudioTrack stream end and fix race"...Glenn Kasten2014-03-071-17/+15
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 2f55c2c0: Merge "Simplify AudioTrack stream end and fix race" into klp-devGlenn Kasten2014-03-071-17/+15
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "Simplify AudioTrack stream end and fix race" into klp-devGlenn Kasten2014-03-071-17/+15
| | |\ \ \ \
| | | * | | | Simplify AudioTrack stream end and fix raceGlenn Kasten2014-03-071-17/+15
* | | | | | | am 4293011d: am 5874615f: Allow for larger codec private dataMarco Nelissen2014-03-071-30/+50
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 5874615f: Allow for larger codec private dataMarco Nelissen2014-03-071-30/+50
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Allow for larger codec private dataMarco Nelissen2014-03-071-30/+50
| | |/ / / /
| | * | | | Merge "Fix SIGABRT when playing mp4 file" into klp-devMarco Nelissen2014-03-071-0/+6
| | |\ \ \ \
| | | * | | | Fix SIGABRT when playing mp4 fileMarco Nelissen2014-03-061-0/+6
* | | | | | | am 2ad7af29: Merge "Check for ARCH_ARM_HAVE_NEON flag only for ARM arch"Narayan Kamath2014-03-072-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-0714-61/+62
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge "LP64 fixes for media/libeffects"Narayan Kamath2014-03-0714-61/+62
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | LP64 fixes for media/libeffectsAshok Bhat2014-02-2014-61/+62
* | | | | | | | resolved conflicts for merge of 8d1caa02 to klp-modular-dev-plus-aospNarayan Kamath2014-03-079-252/+853
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | am 49ea1337: Merge changes I787e1c05,I72d3a5e1,I0a5cc65f,I75fc2a25,I2c2be08d,...Lajos Molnar2014-03-0712-266/+893
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | * | | | | | Merge changes I787e1c05,I72d3a5e1,I0a5cc65f,I75fc2a25,I2c2be08d, ... into klp...Lajos Molnar2014-03-0712-266/+893
| | |\ \ \ \ \ \
| | | * | | | | | LiveSession: Use the actual, possibly redirected url as base in the M3UMartin Storsjo2014-03-062-4/+13
generated by cgit v1.1 at 2024-05-29 02:59:44 +0000