summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | am 1f5b133a: Merge "When INFO_FORMAT_CHANGED event comes in before the render...James Dong2010-12-081-0/+2
|\ \ \ | |/ /
| * | When INFO_FORMAT_CHANGED event comes in before the renderer was initialized, ...James Dong2010-12-081-0/+2
* | | am d4c5478a: Merge "Be conservative in estimating the file size limit." into ...James Dong2010-12-022-1/+12
|\ \ \ | |/ /
| * | Be conservative in estimating the file size limit.James Dong2010-11-302-1/+12
* | | am 30c81844: Merge "DO NOT MERGE Support for "chunked" HTTP transfer encoding...Andreas Huber2010-11-304-13/+142
|\ \ \ | |/ /
| * | Merge "DO NOT MERGE Support for "chunked" HTTP transfer encoding." into ginge...Andreas Huber2010-11-304-13/+142
| |\ \
| | * | DO NOT MERGE Support for "chunked" HTTP transfer encoding.Andreas Huber2010-11-304-13/+142
* | | | am a41c1e1d: Merge "DO NOT MERGE Upgrade to the latest version of libwebm to ...Andreas Huber2010-11-303-3533/+5067
|\ \ \ \ | |/ / /
| * | | Merge "DO NOT MERGE Upgrade to the latest version of libwebm to fix YouTube w...Andreas Huber2010-11-303-3533/+5067
| |\ \ \ | | |/ / | |/| |
| | * | DO NOT MERGE Upgrade to the latest version of libwebm to fix YouTube webm pla...Andreas Huber2010-11-303-3533/+5067
* | | | am 567b2bd1: Merge "After seeking display the first new video frame right awa...Andreas Huber2010-11-301-0/+6
|\ \ \ \ | |/ / /
| * | | Merge "After seeking display the first new video frame right away without con...Andreas Huber2010-11-301-0/+6
| |\ \ \
| | * | | After seeking display the first new video frame right away without concern fo...Andreas Huber2010-11-301-0/+6
* | | | | am 688f4c58: Merge "Update java doc for visualizer FFT capture." into gingerb...Eric Laurent2010-11-301-8/+38
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Update java doc for visualizer FFT capture." into gingerbreadEric Laurent2010-11-301-8/+38
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Update java doc for visualizer FFT capture.Eric Laurent2010-10-281-8/+38
* | | | | am b690e55d: Merge "DO NOT MERGE - Instead of asserting that ISurface success...Andreas Huber2010-11-305-57/+120
|\ \ \ \ \ | |/ / / /
| * | | | DO NOT MERGE - Instead of asserting that ISurface successfully registered buf...Andreas Huber2010-11-305-57/+120