Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Support for parsing of "folded" RTSP header values and some tweaks to the AMR... | Andreas Huber | 2011-12-09 | 2 | -9/+31 |
* | am 6727a43f: am 54a53841: Merge "Fetch at least 192KB to avoid our mp3 sniffe... | Dave Burke | 2011-12-07 | 1 | -2/+2 |
|\ | |||||
| * | am 54a53841: Merge "Fetch at least 192KB to avoid our mp3 sniffer from blocki... | Dave Burke | 2011-12-07 | 1 | -2/+2 |
| |\ | |||||
| | * | Merge "Fetch at least 192KB to avoid our mp3 sniffer from blocking on data." ... | Dave Burke | 2011-12-07 | 1 | -2/+2 |
| | |\ | |||||
| | | * | Fetch at least 192KB to avoid our mp3 sniffer from blocking on data. | Andreas Huber | 2011-12-07 | 1 | -2/+2 |
* | | | | Reconcile with ics-mr1-release | The Android Open Source Project | 2011-12-07 | 0 | -0/+0 |
|\ \ \ \ | |||||
| * \ \ \ | merge in ics-mr1-release history after reset to ics-mr1 | The Android Automerger | 2011-12-06 | 0 | -0/+0 |
| |\ \ \ \ | | |_|_|/ | |/| | | | |||||
* | | | | | am 6ee7bca1: (-s ours) am 3de8d36b: Reconcile with ics-mr0-release | The Android Open Source Project | 2011-12-07 | 0 | -0/+0 |
|\ \ \ \ \ | | |_|/ / | |/| | | | |||||
| * | | | | am 3de8d36b: Reconcile with ics-mr0-release | The Android Open Source Project | 2011-12-07 | 0 | -0/+0 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| | * | | | Reconcile with ics-mr0-release | The Android Open Source Project | 2011-12-07 | 0 | -0/+0 |
| | |\ \ \ | | | |/ / | | |/| | | |||||
| | | * | | DO NOT MERGE: Remove the AVI extractor. | Andreas Huber | 2011-12-06 | 3 | -6/+0 |
* | | | | | Merge "Allow data uris to be data sources" | Narayan Kamath | 2011-12-07 | 4 | -2/+156 |
|\ \ \ \ \ | |||||
| * | | | | | Allow data uris to be data sources | Narayan Kamath | 2011-12-06 | 4 | -2/+156 |
* | | | | | | am 92860d5d: (-s ours) am 791a3183: Merge "Merge commit \'babb7200\' into man... | Andreas Huber | 2011-12-06 | 0 | -0/+0 |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| * | | | | | am 791a3183: Merge "Merge commit \'babb7200\' into manualmerge" into ics-mr1 | Andreas Huber | 2011-12-06 | 0 | -0/+0 |
| |\ \ \ \ \ | | | |/ / / | | |/| | | | |||||
| | * | | | | Merge commit 'babb7200' into manualmerge | Andreas Huber | 2011-12-06 | 0 | -0/+0 |
| | |\ \ \ \ | |||||
| | | * | | | | DO NOT MERGE: Remove the AVI extractor. | Andreas Huber | 2011-12-06 | 3 | -6/+0 |
| | | | |/ / | | | |/| | | |||||
* | | | | | | am 49782b81: (-s ours) am 6b8b5a0a: Merge "DO NOT MERGE - Consider I-Frame at... | James Dong | 2011-12-06 | 0 | -0/+0 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | am 6b8b5a0a: Merge "DO NOT MERGE - Consider I-Frame at zeroeth position when ... | James Dong | 2011-12-06 | 1 | -0/+8 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Merge "DO NOT MERGE - Consider I-Frame at zeroeth position when searching for... | James Dong | 2011-12-06 | 1 | -0/+8 |
| | |\ \ \ \ | |||||
| | | * | | | | DO NOT MERGE - Consider I-Frame at zeroeth position when searching for sync f... | James Dong | 2011-12-05 | 1 | -0/+8 |
* | | | | | | | am c4738293: (-s ours) am 05d63069: Merge "DO NOT MERGE: Remove the AVI extra... | Andreas Huber | 2011-12-06 | 0 | -0/+0 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | am 05d63069: Merge "DO NOT MERGE: Remove the AVI extractor." into ics-mr1 | Andreas Huber | 2011-12-06 | 3 | -6/+0 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | DO NOT MERGE: Remove the AVI extractor. | Andreas Huber | 2011-12-06 | 3 | -6/+0 |
* | | | | | | | Reconcile with ics-mr1-release | The Android Open Source Project | 2011-12-06 | 0 | -0/+0 |
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | / | | |_|_|_|/ | |/| | | | | |||||
| * | | | | | merge in ics-mr1-release history after reset to ics-mr1 | The Android Automerger | 2011-12-05 | 0 | -0/+0 |
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
* | | | | | | am 5433e25f: am 7b6aff23: Merge "audioflinger: fix audio skipping over A2DP" ... | Eric Laurent | 2011-12-05 | 2 | -8/+14 |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| * | | | | | am 7b6aff23: Merge "audioflinger: fix audio skipping over A2DP" into ics-mr1 | Eric Laurent | 2011-12-05 | 2 | -8/+14 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Merge "audioflinger: fix audio skipping over A2DP" into ics-mr1 | Eric Laurent | 2011-12-05 | 2 | -8/+14 |
| | |\ \ \ \ | | | |_|/ / | | |/| | | | |||||
| | | * | | | audioflinger: fix audio skipping over A2DP | Eric Laurent | 2011-12-05 | 2 | -8/+14 |
* | | | | | | resolved conflicts for merge of 07bacabe to master | Andreas Huber | 2011-12-05 | 2 | -26/+134 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | am f2e12498: Merge "Properly identify how much metadata we need to cache in o... | Andreas Huber | 2011-12-05 | 3 | -41/+136 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Properly identify how much metadata we need to cache in order to instantiate | Andreas Huber | 2011-12-05 | 3 | -41/+136 |
* | | | | | | Reconcile with ics-mr1-release | The Android Open Source Project | 2011-12-05 | 0 | -0/+0 |
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | |||||
| * | | | | | merge in ics-mr1-release history after reset to ics-mr1 | The Android Automerger | 2011-12-02 | 0 | -0/+0 |
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
* | | | | | | am 9f3f3c2f: (-s ours) am 1a3ece9f: Merge "MTP: Add support for restricting P... | Mike Lockwood | 2011-12-02 | 0 | -0/+0 |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| * | | | | | am 1a3ece9f: Merge "MTP: Add support for restricting PTP to only certain subd... | Mike Lockwood | 2011-12-02 | 1 | -4/+7 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | MTP: Add support for restricting PTP to only certain subdirectories of the st... | Mike Lockwood | 2011-12-02 | 1 | -4/+7 |
* | | | | | | am 7bbc3c4b: (-s ours) am 7f87d9cf: Merge "MTP: Don\'t attempt to read more t... | Mike Lockwood | 2011-12-02 | 0 | -0/+0 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | am 7f87d9cf: Merge "MTP: Don\'t attempt to read more than 16K at a time from ... | Mike Lockwood | 2011-12-02 | 1 | -2/+4 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | MTP: Don't attempt to read more than 16K at a time from the MTP driver DO NOT... | Mike Lockwood | 2011-12-02 | 1 | -2/+4 |
* | | | | | | Merge "MTP: Add support for restricting PTP to only certain subdirectories of... | Mike Lockwood | 2011-12-02 | 1 | -4/+7 |
|\ \ \ \ \ \ | |||||
| * | | | | | | MTP: Add support for restricting PTP to only certain subdirectories of the st... | Mike Lockwood | 2011-12-02 | 1 | -4/+7 |
* | | | | | | | Merge "MTP: Don't attempt to read more than 16K at a time from the MTP driver" | Mike Lockwood | 2011-12-02 | 1 | -2/+4 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | MTP: Don't attempt to read more than 16K at a time from the MTP driver | Mike Lockwood | 2011-12-01 | 1 | -2/+4 |
* | | | | | | | Reconcile with ics-mr1-release | The Android Open Source Project | 2011-12-02 | 0 | -0/+0 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | / / / | | |_|/ / / | |/| | | | | |||||
| * | | | | | merge in ics-mr1-release history after reset to ics-mr1 | The Android Automerger | 2011-12-01 | 0 | -0/+0 |
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
* | | | | | | am 10526a0b: am 2c2ed7be: Merge "Fixes a typo in AVIExtractor that would adve... | Andreas Huber | 2011-12-01 | 1 | -1/+1 |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| * | | | | | am 2c2ed7be: Merge "Fixes a typo in AVIExtractor that would advertise the wro... | Andreas Huber | 2011-12-01 | 1 | -1/+1 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Fixes a typo in AVIExtractor that would advertise the wrong video dimensions | Andreas Huber | 2011-12-01 | 1 | -1/+1 |