Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Reconcile with ics-mr1-release | The Android Open Source Project | 2011-11-18 | 0 | -0/+0 |
|\ | |||||
| * | merge in ics-mr1-release history after reset to ics-mr1 | The Android Automerger | 2011-11-16 | 0 | -0/+0 |
| |\ | |||||
* | \ | resolved conflicts for merge of fbb122bf to master | Chih-Chung Chang | 2011-11-16 | 2 | -1/+11 |
|\ \ \ | |/ / | |||||
| * | | Merge "Fix 5607624: Native crash in movie studio while previewing the movie" ... | Chih-Chung Chang | 2011-11-15 | 2 | -1/+11 |
| |\ \ | |||||
| | * | | Fix 5607624: Native crash in movie studio while previewing the movie | Chih-Chung Chang | 2011-11-15 | 2 | -1/+11 |
* | | | | am 811c53c5: Fix for issue 5309336 -add videoeditor maximum prefetch... | Hong Teng | 2011-11-15 | 3 | -8/+47 |
|\ \ \ \ | |/ / / | |||||
| * | | | Fix for issue 5309336 | Hong Teng | 2011-11-14 | 3 | -8/+47 |
| |/ / | |||||
* | | | Reconcile with ics-mr1-release | The Android Open Source Project | 2011-10-31 | 0 | -0/+0 |
|\ \ \ | | |/ | |/| | |||||
| * | | merge in ics-release history after reset to master | The Android Automerger | 2011-10-20 | 0 | -0/+0 |
| |\ \ | | |/ | |/| | |||||
| | * | merge in ics-release history after reset to master | The Android Automerger | 2011-10-19 | 0 | -0/+0 |
| | |\ | |||||
| | | * | merge in ics-release history after reset to master | The Android Automerger | 2011-10-16 | 0 | -0/+0 |
| | | |\ | |||||
| | | | * | merge in ics-release history after reset to master | The Android Automerger | 2011-10-06 | 0 | -0/+0 |
| | | | |\ | |||||
| | | | | * | merge in ics-release history after reset to master | The Android Automerger | 2011-10-05 | 0 | -0/+0 |
| | | | | |\ | |||||
| | | | | | * | merge in ics-release history after reset to master | The Android Automerger | 2011-09-27 | 0 | -0/+0 |
| | | | | | |\ | |||||
| | | | | | | * | merge in ics-release history after reset to master | The Android Automerger | 2011-09-25 | 0 | -0/+0 |
| | | | | | | |\ | |||||
| | | | | | | | * | merge in ics-release history after reset to master | The Android Automerger | 2011-09-18 | 0 | -0/+0 |
| | | | | | | | |\ | |||||
| | | | | | | | | * | merge in ics-release history after reset to master | The Android Automerger | 2011-09-14 | 0 | -0/+0 |
| | | | | | | | | |\ | |||||
| | | | | | | | | | * | merge in ics-release history after reset to master | The Android Automerger | 2011-09-06 | 0 | -0/+0 |
| | | | | | | | | | |\ | |||||
| | | | | | | | | | | * | merge in ics-release history after reset to master | The Android Automerger | 2011-09-01 | 0 | -0/+0 |
| | | | | | | | | | | |\ | |||||
| | | | | | | | | | | | * | merge in ics-release history after reset to master | The Android Automerger | 2011-08-30 | 0 | -0/+0 |
| | | | | | | | | | | | |\ | |||||
| | | | | | | | | | | | | * | merge in ics-release history after reset to master | The Android Automerger | 2011-08-30 | 0 | -0/+0 |
| | | | | | | | | | | | | |\ | | | | | | | | | | | | | |/ | | | | | | | | | | | | |/| | |||||
* | | | | | | | | | | | | | | Rename LOGV(_IF) to ALOGV(_IF) DO NOT MERGE | Steve Block | 2011-10-25 | 21 | -688/+688 |
|/ / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | am f23f7257: Merge "Fix for 5477832 Movie Studio crash when trying to import ... | James Dong | 2011-10-20 | 2 | -0/+18 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge "Fix for 5477832 Movie Studio crash when trying to import the attached ... | James Dong | 2011-10-20 | 2 | -0/+18 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | Fix for 5477832 Movie Studio crash when trying to import the attached h263 file. | Rajneesh Chowdury | 2011-10-19 | 2 | -0/+18 |
* | | | | | | | | | | | | | | | am 52da22e1: Fix for 5234840 Corrupted frames in transition | Hong Teng | 2011-10-19 | 1 | -3/+6 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | | | / / / / / / / / / / / / | |_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Fix for 5234840 Corrupted frames in transition | Hong Teng | 2011-10-19 | 1 | -3/+6 |
| |/ / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | am 71184927: Fix for 5154138 Titles are not aligned properly in a exported mo... | Hong Teng | 2011-10-18 | 3 | -336/+428 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | / / / / / / / / / / / | |/ / / / / / / / / / / |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | Fix for 5154138 Titles are not aligned properly in a exported movie from Movi... | Hong Teng | 2011-10-18 | 3 | -336/+428 |
| |/ / / / / / / / / / | |||||
* | | | | | | | | | | | Remove RTSP support from libvideoeditor's PreviewPlayer... | Andreas Huber | 2011-10-12 | 3 | -77/+4 |
|/ / / / / / / / / / | |||||
* | | | | | | | | | | Merge "Fix for 5369981 Native crash : testPreviewWithEndAudioTrack functional... | Hong Teng | 2011-10-05 | 2 | -3/+20 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Fix for 5369981 Native crash : testPreviewWithEndAudioTrack functional test. | Hong Teng | 2011-10-05 | 2 | -3/+20 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Video editor incorrectly rejects videos that could be supported by the HW dec... | James Dong | 2011-10-03 | 1 | -13/+27 |
|/ / / / / / / / | |||||
* | | | | | | | | Merge "Fix for 5205420 compression domain trimming fallback mechanism" | Rajneesh Chowdury | 2011-09-26 | 2 | -20/+43 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
| * | | | | | | | Fix for 5205420 compression domain trimming fallback mechanism | Rajneesh Chowdury | 2011-09-23 | 2 | -20/+43 |
* | | | | | | | | am 996fb989: (-s ours) DO NOT MERGE. Fix for 5247764 profile and level settin... | Rajneesh Chowdury | 2011-09-23 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
| * | | | | | | | DO NOT MERGE. Fix for 5247764 profile and level settings are not always corre... | Rajneesh Chowdury | 2011-09-23 | 3 | -12/+316 |
* | | | | | | | | Fix for 5274212 Transition clip contains more video frames from 1 video clip ... | Rajneesh Chowdury | 2011-09-22 | 1 | -4/+4 |
| |/ / / / / / |/| | | | | | | |||||
* | | | | | | | am 2e200ef7: (-s ours) DO NOT MERGE - Fix for bug 5255159 Cannot play exporte... | Rajneesh Chowdury | 2011-09-15 | 0 | -0/+0 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | DO NOT MERGE - Fix for bug 5255159 Cannot play exported movie from Movie Studio | Rajneesh Chowdury | 2011-09-15 | 2 | -23/+10 |
| |/ / / / / | |||||
* | | | | | | Merge "Fix for 5247764 profile and level settings are not always correctly set" | Rajneesh Chowdury | 2011-09-15 | 3 | -12/+316 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix for 5247764 profile and level settings are not always correctly set | Rajneesh Chowdury | 2011-09-14 | 3 | -12/+316 |
| |/ / / / / | |||||
* | | | | | | Fix for bug 5255159 Cannot play exported movie from Movie Studio | Rajneesh Chowdury | 2011-09-14 | 2 | -23/+10 |
|/ / / / / | |||||
* | | | | | Fix for | Hong Teng | 2011-09-12 | 2 | -23/+28 |
|/ / / / | |||||
* | | | | Enable some logs to debug 5195693. | Chih-Chung Chang | 2011-09-05 | 1 | -5/+6 |
* | | | | Fix 5240036: We didn't handle the 1920x1080 resolution. | Chih-Chung Chang | 2011-09-02 | 1 | -0/+6 |
|/ / / | |||||
* | | | Fix for 5156702 Rotate video output for thumbnails and export | Rajneesh Chowdury | 2011-08-30 | 12 | -31/+663 |
|/ / | |||||
* | | Merge "Fix 5200858: we need to pass timestamp to render correct frames." | Chih-Chung Chang | 2011-08-29 | 1 | -4/+5 |
|\ \ | |/ |/| | |||||
| * | Fix 5200858: we need to pass timestamp to render correct frames. | Chih-Chung Chang | 2011-08-29 | 1 | -4/+5 |
* | | Merge "Fix 5123908: Native crash rewinding movie" | Chih-Chung Chang | 2011-08-28 | 3 | -261/+149 |
|\ \ | |/ |/| |