summaryrefslogtreecommitdiffstats
path: root/media/libstagefright
Commit message (Expand)AuthorAgeFilesLines
* Merge "stagefright aacenc: Mark codeWord as UWord16"Conley Owens2011-07-181-1/+1
|\
| * stagefright aacenc: Mark codeWord as UWord16Martin Storsjo2011-04-231-1/+1
* | Merge "stagefright: Include stdlib.h for malloc/free"Deckard Autoverifier2011-07-181-3/+1
|\ \
| * | stagefright: Include stdlib.h for malloc/freeMartin Storsjo2011-06-221-3/+1
* | | Merge "stagefright amrwbenc: Remove a duplicate, unused file"Deckard Autoverifier2011-07-181-73/+0
|\ \ \
| * | | stagefright amrwbenc: Remove a duplicate, unused fileMartin Storsjo2011-06-231-73/+0
| |/ /
* | | Merge "stagefright aacenc: Make the mem_malloc function 64-bit safe"Deckard Autoverifier2011-07-181-2/+7
|\ \ \
| * | | stagefright aacenc: Make the mem_malloc function 64-bit safeMartin Storsjo2011-06-221-2/+7
| |/ /
* | | Merge "stagefright: Only use __int64 on MSVC, not on all win32 compilers"Deckard Autoverifier2011-07-181-1/+1
|\ \ \
| * | | stagefright: Only use __int64 on MSVC, not on all win32 compilersMartin Storsjo2011-06-221-1/+1
| |/ /
* | | Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace"Conley Owens2011-07-18150-5154/+5154
|\ \ \ | |/ / |/| / | |/
| * stagefright aacenc/amrwbenc: Remove trailing whitespaceMans Rullgard2011-04-23150-5154/+5154
* | 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 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 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 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 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-143-31/+27
|\ \ | |/
| * Squash commits of the following patches, cherry-picked from other branch - do...James Dong2011-01-123-31/+27
* | am 7c615360: Fail to parse duration instead of asserting, if the server respo...Andreas Huber2011-01-121-5/+7
|\ \ | |/
| * Fail to parse duration instead of asserting, if the server response cannot be...Andreas Huber2011-01-121-5/+7
* | am 7e2f9cc8: DO NOT MERGE: Fix Matroska issuesAndreas Huber2011-01-113-75/+317
|\ \ | |/
| * DO NOT MERGE: Fix Matroska issuesAndreas Huber2011-01-113-75/+317
* | resolved conflicts for merge of e7fbfb6b to gingerbread-plus-aosprepo sync2011-01-118-38/+689
|\ \ | |/
| * DO NOT MERGE: Fix parsing of ntp= PLAY response.Andreas Huber2011-01-118-39/+690