summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* am d8b027b1: Merge "stagefright aacenc/amrwbenc: Convert line breaks to Unix ...Conley Owens2011-06-09185-30089/+30089
|\
| * Merge "stagefright aacenc/amrwbenc: Convert line breaks to Unix style"Conley Owens2011-06-09185-30089/+30089
| |\
| | * stagefright aacenc/amrwbenc: Convert line breaks to Unix styleMans Rullgard2011-04-23185-30089/+30089
* | | am a02d9bf9: Make sure we don\'t read from invalid fdsMarco Nelissen2011-06-091-0/+3
|\ \ \
| * | | Make sure we don't read from invalid fdsMarco Nelissen2011-06-091-0/+3
* | | | am 8050a02b: DO NOT MERGE: Linux sockets are odd, closing a socket descriptor...Andreas Huber2011-06-021-17/+79
|\ \ \ \ | |/ / / | | / / | |/ / |/| |
| * | DO NOT MERGE: Linux sockets are odd, closing a socket descriptor does not abo...Andreas Huber2011-06-011-17/+79
* | | Merge "Improved conversion accuracy of exif geotag data"Conley Owens2011-04-291-13/+19
|\ \ \
| * | | Improved conversion accuracy of exif geotag dataOscar Rydhe2011-01-171-13/+19
* | | | am f0f1ceeb: DO NOT MERGE: Make sure we restart the prefetcher immediately wh...Andreas Huber2011-04-183-12/+26
|\ \ \ \ | | |/ / | |/| |
| * | | DO NOT MERGE: Make sure we restart the prefetcher immediately when trying to ...Andreas Huber2011-04-143-12/+26
* | | | am ea5d2c58: Merge "When read() from AudioRecord returns 0 or negative value,...James Dong2011-04-041-2/+3
|\ \ \ \ | |/ / /
| * | | When read() from AudioRecord returns 0 or negative value, report an error to ...James Dong2011-03-301-2/+3
* | | | am f0dbf00d: Merge "Handle OutOfMemoryError when decoding images in Thumbnail...Brad Fitzpatrick2011-03-281-1/+3
|\ \ \ \ | | |_|/ | |/| |
| * | | Handle OutOfMemoryError when decoding images in ThumbnailUtilsChrister Fletcher2011-03-281-1/+3
* | | | am 2fdf829a: Merge "Remove unnecessary SkImageDecoder_libjpeg.cpp"Kenny Root2011-03-111-5/+0
|\ \ \ \ | |/ / /
| * | | Remove unnecessary SkImageDecoder_libjpeg.cppChih-Wei Huang2011-03-101-5/+0
* | | | am 68f66b94: Merge "MP3Extractor and MP3 decoder fixes - DO NOT MERGE" into g...James Dong2011-03-112-8/+47
|\ \ \ \ | | |/ / | |/| |
| * | | MP3Extractor and MP3 decoder fixes - DO NOT MERGEJames Dong2011-03-112-8/+47
* | | | am bd0e806a: Support IPv6->IPv4 fallback in HTTP streaming.Lorenzo Colitti2011-03-091-14/+24
|\ \ \ \ | |/ / /
| * | | Support IPv6->IPv4 fallback in HTTP streaming.Lorenzo Colitti2011-03-081-14/+24
* | | | am b9da16a1: Support IPv6 in HTTP streaming.Lorenzo Colitti2011-03-091-9/+17
|\ \ \ \ | |/ / /
| * | | Support IPv6 in HTTP streaming.Lorenzo Colitti2011-03-081-9/+17
* | | | am d581c047: Add missing copyright headers for a couple of files. DO NOT MERG...James Dong2011-03-072-0/+32
|\ \ \ \ | |/ / /
| * | | Add missing copyright headers for a couple of files. DO NOT MERGEJames Dong2011-03-072-0/+32
* | | | am dbe09da6: DO NOT MERGE: Respond to RTSP server->client requests.Andreas Huber2011-02-162-7/+83
|\ \ \ \ | |/ / /
| * | | DO NOT MERGE: Respond to RTSP server->client requests.Andreas Huber2011-02-162-7/+83
* | | | am 8db7a7bf: Merge "DO NOT MERGE: Derive the Transport "source" attribute fro...Andreas Huber2011-02-161-23/+42
|\ \ \ \ | |/ / /
| * | | DO NOT MERGE: Derive the Transport "source" attribute from the RTSP endpoint ...Andreas Huber2011-02-151-23/+42
* | | | am d1ba051a: DO NOT MERGE: Work around several issues with non-compliant RTSP...Andreas Huber2011-02-156-25/+81
|\ \ \ \ | |/ / / | | / / | |/ / |/| |
| * | DO NOT MERGE: Work around several issues with non-compliant RTSP servers.Andreas Huber2011-02-156-25/+81
* | | am b6c2e2b4: DO NOT MERGE: More robust parsing of NPT time ranges in RTSP.Andreas Huber2011-01-283-20/+46
|\ \ \ | |/ /
| * | DO NOT MERGE: More robust parsing of NPT time ranges in RTSP.Andreas Huber2011-01-283-20/+46
* | | am 2dce338e: DO NOT MERGE: This particular RTSP server streams MPEG4-LATM aud...Andreas Huber2011-01-261-1/+4
|\ \ \ | |/ /
| * | DO NOT MERGE: This particular RTSP server streams MPEG4-LATM audio with extra...Andreas Huber2011-01-261-1/+4
* | | am 2ba92c71: do not merge bug 3370834 Cherrypick from masterJean-Michel Trivi2011-01-266-4/+22
|\ \ \ | |/ /
| * | do not merge bug 3370834 Cherrypick from masterJean-Michel Trivi2011-01-266-4/+22
* | | am c929677e: Merge "Increase the number of useful bits in the spectrum." into...Marco Nelissen2011-01-251-2/+7
|\ \ \ | |/ /
| * | Merge "Increase the number of useful bits in the spectrum." into gingerbreadMarco Nelissen2011-01-251-2/+7
| |\ \
| | * | Increase the number of useful bits in the spectrum.Marco Nelissen2011-01-241-2/+7
* | | | am efebdf4b: DO NOT MERGE: Support non-multiple-of-16 dimensions in MPEG4/H.2...Andreas Huber2011-01-243-9/+23
|\ \ \ \ | |/ / /
| * | | DO NOT MERGE: Support non-multiple-of-16 dimensions in MPEG4/H.263 software d...Andreas Huber2011-01-243-9/+23
| |/ /
* | | am 996de2dd: Merge "Avoid using String.format in MediaRecorder"Brad Fitzpatrick2011-01-241-5/+5
|\ \ \
| * | | Avoid using String.format in MediaRecorderHenrik Backlund2011-01-241-5/+5
| | |/ | |/|
* | | am 65d39eeb: Merge "DO NOT MERGE: Prefill the cache before trying to instanti...Dave Sparks2011-01-202-3/+31
|\ \ \ | | |/ | |/|
| * | DO NOT MERGE: Prefill the cache before trying to instantiate the media extrac...Andreas Huber2011-01-192-3/+31
* | | am e9a00235: Merge "DO NOT MERGE: Apparently our native TCP sockets do not re...Andreas Huber2011-01-191-4/+81
|\ \ \ | |/ /
| * | DO NOT MERGE: Apparently our native TCP sockets do not return an error from b...Andreas Huber2011-01-181-4/+81
* | | merge 83fdc69e from gingerbread - do not mergeJean-Baptiste Queru2011-01-1413-272/+281
|\ \ \ | |/ /
| * | Squash commits of the following patches, cherry-picked from other branch - do...James Dong2011-01-1213-272/+281