summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* am 06da69d5: Merge "frameworks/av: convert LOCAL_MODULE_PATH to LOCAL_MODULE_...Colin Cross2014-01-287-9/+9
|\
| * frameworks/av: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATHColin Cross2014-01-277-9/+9
* | am 4ef1dc2d: Merge "Only increase the counter when we do take a wakelock"Eric Laurent2014-01-271-5/+7
|\ \ | |/
| * Merge "Only increase the counter when we do take a wakelock"Eric Laurent2014-01-271-5/+7
| |\
| | * Only increase the counter when we do take a wakelockJimmy Dalqvist2014-01-221-5/+7
* | | am d0e7e801: Merge "Do partial reads in MemoryLeakTrackUtil"Eric Laurent2014-01-271-3/+11
|\ \ \ | |/ /
| * | Do partial reads in MemoryLeakTrackUtilOscar Rydhé2014-01-231-3/+11
| |/
* | am 96a7b5a9: Merge "Long mp3 metadata displays as corrupted file after transfer"Marco Nelissen2014-01-173-18/+26
|\ \ | |/
| * Merge "Long mp3 metadata displays as corrupted file after transfer"Marco Nelissen2014-01-173-18/+26
| |\
| | * Long mp3 metadata displays as corrupted file after transferYin Liu2013-12-203-18/+26
* | | am 07a017d3: Merge "Added support for ID3v2 meta data in 3gp files"Marco Nelissen2014-01-175-9/+89
|\ \ \ | |/ /
| * | Merge "Added support for ID3v2 meta data in 3gp files"Marco Nelissen2014-01-175-9/+89
| |\ \
| | * | Added support for ID3v2 meta data in 3gp filesOscar Rydhé2014-01-165-9/+89
* | | | am 4cc47940: Merge "Fix compile error in NuPlayerRenderer debug print"Marco Nelissen2014-01-171-1/+3
|\ \ \ \ | |/ / /
| * | | Merge "Fix compile error in NuPlayerRenderer debug print"Marco Nelissen2014-01-171-1/+3
| |\ \ \ | | |/ / | |/| |
| | * | Fix compile error in NuPlayerRenderer debug printOscar Rydhé2014-01-031-1/+3
* | | | am 1e8a57c2: Merge "Avoid jumps to faulty position after seeks"Marco Nelissen2014-01-151-1/+4
|\ \ \ \ | |/ / /
| * | | Merge "Avoid jumps to faulty position after seeks"Marco Nelissen2014-01-151-1/+4
| |\ \ \
| | * | | Avoid jumps to faulty position after seeksRoger1 Jonsson2013-12-181-1/+4
| | | |/ | | |/|
* | | | am e311b15c: Merge "Fix c++11 narrowing"Nick Kralevich2014-01-101-1/+1
|\ \ \ \ | |/ / /
| * | | Merge "Fix c++11 narrowing"Nick Kralevich2014-01-111-1/+1
| |\ \ \
| | * | | Fix c++11 narrowingsynergydev2013-10-251-1/+1
* | | | | am 5ca94d2f: Merge "HLS: Fixed rounding error with decimal segment duration"Marco Nelissen2014-01-091-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | Merge "HLS: Fixed rounding error with decimal segment duration"Marco Nelissen2014-01-091-1/+1
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | HLS: Fixed rounding error with decimal segment durationOscar Rydhé2013-12-191-1/+1
| | | |/ | | |/|
* | | | am 8115f4b2: Merge "stagefright: do not offload LD-AAC decoding"Eric Laurent2013-12-202-0/+14
|\ \ \ \ | |/ / /
| * | | stagefright: do not offload LD-AAC decodingEric Laurent2013-12-212-0/+14
* | | | am 1777ed30: Merge "stagefright: fix offloading HE-AAC sampling rate."Eric Laurent2013-12-201-17/+23
|\ \ \ \ | |/ / /
| * | | stagefright: fix offloading HE-AAC sampling rate.Eric Laurent2013-12-191-17/+23
| |/ /
* | | am 1f95555c: Merge "libeffects: do not use GNU old-style field designators"Nick Kralevich2013-12-172-14/+14
|\ \ \ | |/ /
| * | libeffects: do not use GNU old-style field designatorssynergy dev2013-12-172-14/+14
* | | am 274cc85d: Merge "libstagefright: Delay release of wakelock in TimedEventQu...Eric Laurent2013-12-172-6/+9
|\ \ \ | |/ /
| * | libstagefright: Delay release of wakelock in TimedEventQueueHaynes Mathew George2013-12-172-6/+9
* | | am 645e4397: Merge "AudioTrack: fix position callback after restore"Eric Laurent2013-12-171-1/+0
|\ \ \ | |/ /
| * | AudioTrack: fix position callback after restoreEric Laurent2013-12-171-1/+0
* | | am 9060d498: Merge "update offloaded audio track sampling rate"Eric Laurent2013-12-174-2/+42
|\ \ \ | |/ /
| * | update offloaded audio track sampling rateEric Laurent2013-12-174-2/+42
* | | am a67c7653: Merge "Increase kFastTrackMultiplier from 1 to 2"Glenn Kasten2013-12-171-4/+7
|\ \ \ | |/ /
| * | Merge "Increase kFastTrackMultiplier from 1 to 2"Glenn Kasten2013-12-171-4/+7
| |\ \
| | * | Increase kFastTrackMultiplier from 1 to 2Glenn Kasten2013-12-041-4/+7
| * | | Merge commit '2381f06f374ee0cb8bca0edf5388394432b00e6d' into HEADThe Android Open Source Project2013-12-0524-125/+338
| |\ \ \ | | |/ / | |/| |
* | | | am 92630351: Merge "NuPlayer: Use a software renderer when using software cod...Marco Nelissen2013-11-284-2/+42
|\ \ \ \ | |/ / /
| * | | Merge "NuPlayer: Use a software renderer when using software codecs"Marco Nelissen2013-11-284-2/+42
| |\ \ \
| | * | | NuPlayer: Use a software renderer when using software codecsMartin Storsjo2013-09-254-2/+42
* | | | | am 90892d1b: Merge "Fix SIGABRT when playing mp4 file"Marco Nelissen2013-11-261-0/+6
|\ \ \ \ \ | |/ / / /
| * | | | Fix SIGABRT when playing mp4 fileMarco Nelissen2013-11-251-0/+6
* | | | | am 11e71558: Merge "Fixed data offset at parsing IPMP Descriptors"Marco Nelissen2013-11-251-1/+2
|\ \ \ \ \ | |/ / / /
| * | | | Fixed data offset at parsing IPMP DescriptorsIchitaro Kohara2013-11-251-1/+2
| * | | | Merge commit 'b2059ff384eee8ffb70a7ec8fc5570405201c734' into HEADThe Android Open Source Project2013-11-22178-4065/+13126
| |\ \ \ \
* | \ \ \ \ am 5ea5b020: Merge "WA: Queue extra buffers on output port during reconfig if...Lajos Molnar2013-11-181-0/+28
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |