summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | 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
* | | am 13d1cb56: Merge "Avoid deadlock in OMX::freeNode by making sure OMXCodecOb...James Dong2011-01-102-5/+11
|\ \ \ | |/ /
| * | Avoid deadlock in OMX::freeNode by making sure OMXCodecObserver does not hold...James Dong2011-01-102-5/+11
* | | am 2af4e71d: Merge "Fix the test application orientation. Bug# 3205196" into ...Yu Shan Emily Lau2011-01-071-1/+2
|\ \ \ | |/ /
| * | Merge "Fix the test application orientation. Bug# 3205196" into gingerbreadYu Shan Emily Lau2011-01-071-1/+2
| |\ \
| | * | Fix the test application orientation. Bug# 3205196Yu Shan Emily Lau2011-01-041-1/+2
* | | | am f13d4501: Send "compilation" tag when inserting into the database. It\'s n...Marco Nelissen2011-01-071-0/+5
|\ \ \ \ | |/ / /
| * | | Send "compilation" tag when inserting into the database.Marco Nelissen2011-01-061-0/+5
* | | | am ba77a3f9: Add support for the "compilation" tag in mp3, mp4 and ogg, and a...Marco Nelissen2011-01-066-0/+18
|\ \ \ \ | |/ / /
| * | | Add support for the "compilation" tag in mp3, mp4 and ogg, and also addMarco Nelissen2011-01-066-0/+18
| |/ /
* | | am 2bf89b21: Merge "Expose AMRNB/WB and AAC encoder and related file output f...James Dong2010-12-221-5/+6
|\ \ \ | |/ /
| * | Expose AMRNB/WB and AAC encoder and related file output formats - do not mergeJames Dong2010-12-221-5/+6
* | | am 5a756fb0: Merge "Fix issue 2712130: Sholes: problem when playing audio whi...Eric Laurent2010-12-161-1/+2
|\ \ \ | |/ /
| * | Fix issue 2712130: Sholes: problem when playing audio while recording over bl...Eric Laurent2010-12-151-1/+2