| Commit message (Expand) | Author | Age | Files | Lines |
... | |
| * | | DO NOT MERGE: Fix parsing of ntp= PLAY response. | Andreas Huber | 2011-01-11 | 8 | -39/+690 |
* | | | am 13d1cb56: Merge "Avoid deadlock in OMX::freeNode by making sure OMXCodecOb... | James Dong | 2011-01-10 | 2 | -5/+11 |
|\ \ \
| |/ / |
|
| * | | Avoid deadlock in OMX::freeNode by making sure OMXCodecObserver does not hold... | James Dong | 2011-01-10 | 2 | -5/+11 |
* | | | am 2af4e71d: Merge "Fix the test application orientation. Bug# 3205196" into ... | Yu Shan Emily Lau | 2011-01-07 | 1 | -1/+2 |
|\ \ \
| |/ / |
|
| * | | Merge "Fix the test application orientation. Bug# 3205196" into gingerbread | Yu Shan Emily Lau | 2011-01-07 | 1 | -1/+2 |
| |\ \ |
|
| | * | | Fix the test application orientation. Bug# 3205196 | Yu Shan Emily Lau | 2011-01-04 | 1 | -1/+2 |
* | | | | am f13d4501: Send "compilation" tag when inserting into the database. It\'s n... | Marco Nelissen | 2011-01-07 | 1 | -0/+5 |
|\ \ \ \
| |/ / / |
|
| * | | | Send "compilation" tag when inserting into the database. | Marco Nelissen | 2011-01-06 | 1 | -0/+5 |
* | | | | am ba77a3f9: Add support for the "compilation" tag in mp3, mp4 and ogg, and a... | Marco Nelissen | 2011-01-06 | 6 | -0/+18 |
|\ \ \ \
| |/ / / |
|
| * | | | Add support for the "compilation" tag in mp3, mp4 and ogg, and also add | Marco Nelissen | 2011-01-06 | 6 | -0/+18 |
| |/ / |
|
* | | | am 2bf89b21: Merge "Expose AMRNB/WB and AAC encoder and related file output f... | James Dong | 2010-12-22 | 1 | -5/+6 |
|\ \ \
| |/ / |
|
| * | | Expose AMRNB/WB and AAC encoder and related file output formats - do not merge | James Dong | 2010-12-22 | 1 | -5/+6 |
* | | | am 5a756fb0: Merge "Fix issue 2712130: Sholes: problem when playing audio whi... | Eric Laurent | 2010-12-16 | 1 | -1/+2 |
|\ \ \
| |/ / |
|
| * | | Fix issue 2712130: Sholes: problem when playing audio while recording over bl... | Eric Laurent | 2010-12-15 | 1 | -1/+2 |
* | | | am 1f5b133a: Merge "When INFO_FORMAT_CHANGED event comes in before the render... | James Dong | 2010-12-08 | 1 | -0/+2 |
|\ \ \
| |/ / |
|
| * | | When INFO_FORMAT_CHANGED event comes in before the renderer was initialized, ... | James Dong | 2010-12-08 | 1 | -0/+2 |
* | | | am d4c5478a: Merge "Be conservative in estimating the file size limit." into ... | James Dong | 2010-12-02 | 2 | -1/+12 |
|\ \ \
| |/ / |
|
| * | | Be conservative in estimating the file size limit. | James Dong | 2010-11-30 | 2 | -1/+12 |
* | | | am 30c81844: Merge "DO NOT MERGE Support for "chunked" HTTP transfer encoding... | Andreas Huber | 2010-11-30 | 4 | -13/+142 |
|\ \ \
| |/ / |
|
| * | | Merge "DO NOT MERGE Support for "chunked" HTTP transfer encoding." into ginge... | Andreas Huber | 2010-11-30 | 4 | -13/+142 |
| |\ \ |
|
| | * | | DO NOT MERGE Support for "chunked" HTTP transfer encoding. | Andreas Huber | 2010-11-30 | 4 | -13/+142 |
* | | | | am a41c1e1d: Merge "DO NOT MERGE Upgrade to the latest version of libwebm to ... | Andreas Huber | 2010-11-30 | 3 | -3533/+5067 |
|\ \ \ \
| |/ / / |
|
| * | | | Merge "DO NOT MERGE Upgrade to the latest version of libwebm to fix YouTube w... | Andreas Huber | 2010-11-30 | 3 | -3533/+5067 |
| |\ \ \
| | |/ /
| |/| | |
|
| | * | | DO NOT MERGE Upgrade to the latest version of libwebm to fix YouTube webm pla... | Andreas Huber | 2010-11-30 | 3 | -3533/+5067 |
* | | | | am 567b2bd1: Merge "After seeking display the first new video frame right awa... | Andreas Huber | 2010-11-30 | 1 | -0/+6 |
|\ \ \ \
| |/ / / |
|
| * | | | Merge "After seeking display the first new video frame right away without con... | Andreas Huber | 2010-11-30 | 1 | -0/+6 |
| |\ \ \ |
|
| | * | | | After seeking display the first new video frame right away without concern fo... | Andreas Huber | 2010-11-30 | 1 | -0/+6 |
* | | | | | am 688f4c58: Merge "Update java doc for visualizer FFT capture." into gingerb... | Eric Laurent | 2010-11-30 | 1 | -8/+38 |
|\ \ \ \ \
| |/ / / / |
|
| * | | | | Merge "Update java doc for visualizer FFT capture." into gingerbread | Eric Laurent | 2010-11-30 | 1 | -8/+38 |
| |\ \ \ \
| | |/ / /
| |/| | | |
|
| | * | | | Update java doc for visualizer FFT capture. | Eric Laurent | 2010-10-28 | 1 | -8/+38 |
* | | | | | am b690e55d: Merge "DO NOT MERGE - Instead of asserting that ISurface success... | Andreas Huber | 2010-11-30 | 5 | -57/+120 |
|\ \ \ \ \
| |/ / / / |
|
| * | | | | DO NOT MERGE - Instead of asserting that ISurface successfully registered buf... | Andreas Huber | 2010-11-30 | 5 | -57/+120 |
* | | | | | am 683a7ff9: Merge "Visualizer: Fix the conversion from 8-bit sample to 16-bi... | Chia-chi Yeh | 2010-11-30 | 1 | -4/+4 |
|\ \ \ \ \
| |/ / / /
| | | | /
| |_|_|/
|/| | | |
|
| * | | | Merge "Visualizer: Fix the conversion from 8-bit sample to 16-bit sample." in... | Chia-chi Yeh | 2010-11-29 | 1 | -4/+4 |
| |\ \ \
| | |_|/
| |/| | |
|
| | * | | Visualizer: Fix the conversion from 8-bit sample to 16-bit sample. | Chia-chi Yeh | 2010-11-01 | 1 | -4/+4 |
| | |/ |
|
* | | | am 4da48ec8: Merge "Notify the playback status to DRM agents before the playb... | Gloria Wang | 2010-11-22 | 1 | -7/+12 |
|\ \ \ |
|
| * | | | Notify the playback status to DRM agents before the playback starts | Gloria Wang | 2010-11-22 | 1 | -7/+12 |
* | | | | resolved conflicts for merge of e2ec61b2 to gingerbread-plus-aosp | Jean-Baptiste Queru | 2010-11-19 | 1 | -4/+5 |
|\ \ \ \
| |/ / / |
|
| * | | | StagefrightMediaScanner: Call endFile() for MIDI and OGG files. | Hiroshi Takekawa | 2010-11-19 | 1 | -8/+10 |
* | | | | am 14ac9546: Merge "build failed with g++ v. 4.4.5 err msg: frameworks/base/m... | Jean-Baptiste Queru | 2010-11-19 | 1 | -1/+1 |
|\ \ \ \
| |/ / / |
|
| * | | | build failed with g++ v. 4.4.5 | Matthias Bady | 2010-11-18 | 1 | -1/+1 |
* | | | | am f6bd761f: Use back-facing camera as default in camera/camcorder profile.do... | Wu-cheng Li | 2010-11-08 | 2 | -5/+29 |
|\ \ \ \
| | |/ /
| |/| | |
|
| * | | | Use back-facing camera as default in camera/camcorder profile.do not merge | Wu-cheng Li | 2010-11-09 | 2 | -5/+29 |
* | | | | am 1b2efbca: Merge "Update a comment about when setOrientationHint() should b... | James Dong | 2010-11-08 | 1 | -1/+1 |
|\ \ \ \
| |/ / / |
|
| * | | | Merge "Update a comment about when setOrientationHint() should be called" int... | James Dong | 2010-11-08 | 1 | -1/+1 |
| |\ \ \ |
|
| | * | | | Update a comment about when setOrientationHint() should be called | James Dong | 2010-11-08 | 1 | -1/+1 |
* | | | | | am d2d62d04: Merge "Support extracting thumbnail from rotated video tracks" i... | James Dong | 2010-11-08 | 3 | -1/+66 |
|\ \ \ \ \
| |/ / / / |
|
| * | | | | Support extracting thumbnail from rotated video tracks | James Dong | 2010-11-08 | 3 | -1/+66 |
| |/ / / |
|
* | | | | resolved conflicts for merge of 31dc911a to gingerbread-plus-aosp | Andreas Huber | 2010-11-08 | 8 | -90/+230 |
|\ \ \ \
| |/ / / |
|
| * | | | Support post-decode video rotation. | Andreas Huber | 2010-11-05 | 8 | -89/+228 |