summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Reconcile with ics-mr1-releaseThe Android Open Source Project2011-11-180-0/+0
|\
| * merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-11-160-0/+0
| |\
* | \ resolved conflicts for merge of fbb122bf to masterChih-Chung Chang2011-11-162-1/+11
|\ \ \ | |/ /
| * | Merge "Fix 5607624: Native crash in movie studio while previewing the movie" ...Chih-Chung Chang2011-11-152-1/+11
| |\ \
| | * | Fix 5607624: Native crash in movie studio while previewing the movieChih-Chung Chang2011-11-152-1/+11
* | | | am 811c53c5: Fix for issue 5309336 -add videoeditor maximum prefetch...Hong Teng2011-11-153-8/+47
|\ \ \ \ | |/ / /
| * | | Fix for issue 5309336Hong Teng2011-11-143-8/+47
| |/ /
* | | Reconcile with ics-mr1-releaseThe Android Open Source Project2011-10-310-0/+0
|\ \ \ | | |/ | |/|
| * | merge in ics-release history after reset to masterThe Android Automerger2011-10-200-0/+0
| |\ \ | | |/ | |/|
| | * merge in ics-release history after reset to masterThe Android Automerger2011-10-190-0/+0
| | |\
| | | * merge in ics-release history after reset to masterThe Android Automerger2011-10-160-0/+0
| | | |\
| | | | * merge in ics-release history after reset to masterThe Android Automerger2011-10-060-0/+0
| | | | |\
| | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-10-050-0/+0
| | | | | |\
| | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-09-270-0/+0
| | | | | | |\
| | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-09-250-0/+0
| | | | | | | |\
| | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-09-180-0/+0
| | | | | | | | |\
| | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-09-140-0/+0
| | | | | | | | | |\
| | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-09-060-0/+0
| | | | | | | | | | |\
| | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-09-010-0/+0
| | | | | | | | | | | |\
| | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-08-300-0/+0
| | | | | | | | | | | | |\
| | | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-08-300-0/+0
| | | | | | | | | | | | | |\ | | | | | | | | | | | | | |/ | | | | | | | | | | | | |/|
* | | | | | | | | | | | | | Rename LOGV(_IF) to ALOGV(_IF) DO NOT MERGESteve Block2011-10-2521-688/+688
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | am f23f7257: Merge "Fix for 5477832 Movie Studio crash when trying to import ...James Dong2011-10-202-0/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge "Fix for 5477832 Movie Studio crash when trying to import the attached ...James Dong2011-10-202-0/+18
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Fix for 5477832 Movie Studio crash when trying to import the attached h263 file.Rajneesh Chowdury2011-10-192-0/+18
* | | | | | | | | | | | | | | am 52da22e1: Fix for 5234840 Corrupted frames in transitionHong Teng2011-10-191-3/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | | | / / / / / / / / / / / / | |_|/ / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Fix for 5234840 Corrupted frames in transitionHong Teng2011-10-191-3/+6
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | am 71184927: Fix for 5154138 Titles are not aligned properly in a exported mo...Hong Teng2011-10-183-336/+428
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | / / / / / / / / / / / | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Fix for 5154138 Titles are not aligned properly in a exported movie from Movi...Hong Teng2011-10-183-336/+428
| |/ / / / / / / / / /
* | | | | | | | | | | Remove RTSP support from libvideoeditor's PreviewPlayer...Andreas Huber2011-10-123-77/+4
|/ / / / / / / / / /
* | | | | | | | | | Merge "Fix for 5369981 Native crash : testPreviewWithEndAudioTrack functional...Hong Teng2011-10-052-3/+20
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Fix for 5369981 Native crash : testPreviewWithEndAudioTrack functional test.Hong Teng2011-10-052-3/+20
| |/ / / / / / / /
* | | | | | | | | Video editor incorrectly rejects videos that could be supported by the HW dec...James Dong2011-10-031-13/+27
|/ / / / / / / /
* | | | | | | | Merge "Fix for 5205420 compression domain trimming fallback mechanism"Rajneesh Chowdury2011-09-262-20/+43
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Fix for 5205420 compression domain trimming fallback mechanismRajneesh Chowdury2011-09-232-20/+43
* | | | | | | | am 996fb989: (-s ours) DO NOT MERGE. Fix for 5247764 profile and level settin...Rajneesh Chowdury2011-09-230-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | DO NOT MERGE. Fix for 5247764 profile and level settings are not always corre...Rajneesh Chowdury2011-09-233-12/+316
* | | | | | | | Fix for 5274212 Transition clip contains more video frames from 1 video clip ...Rajneesh Chowdury2011-09-221-4/+4
| |/ / / / / / |/| | | | | |
* | | | | | | am 2e200ef7: (-s ours) DO NOT MERGE - Fix for bug 5255159 Cannot play exporte...Rajneesh Chowdury2011-09-150-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | DO NOT MERGE - Fix for bug 5255159 Cannot play exported movie from Movie StudioRajneesh Chowdury2011-09-152-23/+10
| |/ / / / /
* | | | | | Merge "Fix for 5247764 profile and level settings are not always correctly set"Rajneesh Chowdury2011-09-153-12/+316
|\ \ \ \ \ \
| * | | | | | Fix for 5247764 profile and level settings are not always correctly setRajneesh Chowdury2011-09-143-12/+316
| |/ / / / /
* | | | | | Fix for bug 5255159 Cannot play exported movie from Movie StudioRajneesh Chowdury2011-09-142-23/+10
|/ / / / /
* | | | | Fix forHong Teng2011-09-122-23/+28
|/ / / /
* | | | Enable some logs to debug 5195693.Chih-Chung Chang2011-09-051-5/+6
* | | | Fix 5240036: We didn't handle the 1920x1080 resolution.Chih-Chung Chang2011-09-021-0/+6
|/ / /
* | | Fix for 5156702 Rotate video output for thumbnails and exportRajneesh Chowdury2011-08-3012-31/+663
|/ /
* | Merge "Fix 5200858: we need to pass timestamp to render correct frames."Chih-Chung Chang2011-08-291-4/+5
|\ \ | |/ |/|
| * Fix 5200858: we need to pass timestamp to render correct frames.Chih-Chung Chang2011-08-291-4/+5
* | Merge "Fix 5123908: Native crash rewinding movie"Chih-Chung Chang2011-08-283-261/+149
|\ \ | |/ |/|