summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Remove streaming related logic from preview player.James Dong2012-01-126-307/+32
* Use audio_format_t consistentlyGlenn Kasten2012-01-122-2/+2
* Remove unnecessary drm handling logic in PreviewPlayerBase classJames Dong2012-01-112-185/+9
* Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGESteve Block2012-01-0813-85/+85
* Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGESteve Block2012-01-055-8/+8
* Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGESteve Block2012-01-048-24/+24
* Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGESteve Block2012-01-033-11/+11
* Merge "ditherAndClamp from libaudioutils not AudioMixer"Glenn Kasten2011-12-164-3/+8
|\
| * ditherAndClamp from libaudioutils not AudioMixerGlenn Kasten2011-12-164-3/+8
* | am 576bb4a6: Reconcile with ics-mr1-releaseThe Android Open Source Project2011-12-090-0/+0
|\ \ | |/ |/|
| * Reconcile with ics-mr1-releaseThe Android Open Source Project2011-12-080-0/+0
| |\
* | \ Reconcile with ics-mr1-releaseThe Android Open Source Project2011-12-050-0/+0
|\ \ \ | | |/ | |/|
| * | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-12-020-0/+0
| |\ \ | | |/ | |/|
* | | am 38ca8aaf: Fix for issue 5490443 Native crash while exporting a video Handl...Hong Teng2011-12-021-0/+5
|\ \ \ | |/ /
| * | Fix for issue 5490443 Native crash while exporting a videoHong Teng2011-11-301-0/+5
* | | Reconcile with ics-mr1-releaseThe Android Open Source Project2011-11-300-0/+0
|\ \ \ | | |/ | |/|
| * | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-11-280-0/+0
| |\ \ | | |/ | |/|
* | | am 8e611132: Fix for 5638097 KenBurn generation time increased from 19 secs t...Hong Teng2011-11-221-0/+5
|\ \ \ | |/ /
| * | Fix for 5638097 KenBurn generation time increased from 19 secs to 30 secsHong Teng2011-11-211-0/+5
* | | 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
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |