summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Fetch at least 192KB to avoid our mp3 sniffer from blocking on data." ...Dave Burke2011-12-071-2/+2
|\
| * Fetch at least 192KB to avoid our mp3 sniffer from blocking on data.Andreas Huber2011-12-071-2/+2
* | Reconcile with ics-mr0-releaseThe Android Open Source Project2011-12-070-0/+0
|\ \ | |/ |/|
| * DO NOT MERGE: Remove the AVI extractor.Andreas Huber2011-12-063-6/+0
* | Merge commit 'babb7200' into manualmergeAndreas Huber2011-12-060-0/+0
|\ \
| * | DO NOT MERGE: Remove the AVI extractor.Andreas Huber2011-12-063-6/+0
| |/
* | Merge "DO NOT MERGE - Consider I-Frame at zeroeth position when searching for...James Dong2011-12-061-0/+8
|\ \
| * | DO NOT MERGE - Consider I-Frame at zeroeth position when searching for sync f...James Dong2011-12-051-0/+8
* | | DO NOT MERGE: Remove the AVI extractor.Andreas Huber2011-12-063-6/+0
* | | Merge "audioflinger: fix audio skipping over A2DP" into ics-mr1Eric Laurent2011-12-052-8/+14
|\ \ \ | |/ / |/| |
| * | audioflinger: fix audio skipping over A2DPEric Laurent2011-12-052-8/+14
* | | Properly identify how much metadata we need to cache in order to instantiateAndreas Huber2011-12-053-41/+136
* | | MTP: Add support for restricting PTP to only certain subdirectories of the st...Mike Lockwood2011-12-021-4/+7
* | | MTP: Don't attempt to read more than 16K at a time from the MTP driver DO NOT...Mike Lockwood2011-12-021-2/+4
* | | Fixes a typo in AVIExtractor that would advertise the wrong video dimensionsAndreas Huber2011-12-011-1/+1
* | | Merge "SurfaceMediaSource: use the vid enc usage bit" into ics-mr1Jamie Gennis2011-11-291-1/+1
|\ \ \
| * | | SurfaceMediaSource: use the vid enc usage bitJamie Gennis2011-11-211-1/+1
* | | | Merge "Make sure we can properly shutdown even if" into ics-mr1Andreas Huber2011-11-292-2/+20
|\ \ \ \
| * | | | Make sure we can properly shutdown even ifAndreas Huber2011-11-282-2/+20
| | |/ / | |/| |
* | | | Merge "If an error occurs that prevents us from reallocating buffers during a...Andreas Huber2011-11-292-0/+34
|\ \ \ \
| * | | | If an error occurs that prevents us from reallocating buffers during a format...Andreas Huber2011-11-282-0/+34
| |/ / /
* | | | Merge "Updated (internal) API for IStreamSource to signal discontinuities" in...Andreas Huber2011-11-293-13/+23
|\ \ \ \
| * | | | Updated (internal) API for IStreamSource to signal discontinuitiesAndreas Huber2011-11-293-13/+23
| |/ / /
* | | | Finer granularity discontinuity support.Andreas Huber2011-11-287-60/+151
|/ / /
* | | audioflinger: reduce sleep time to avoid underrunEric Laurent2011-11-221-1/+23
* | | Merge "Report a runtime error instead of asserting on malformed avc configura...Andreas Huber2011-11-222-57/+91
|\ \ \
| * | | Report a runtime error instead of asserting on malformed avc configuration data.Andreas Huber2011-11-182-57/+91
* | | | Fix log spamming during time lapse video recordingJames Dong2011-11-214-14/+18
| |/ / |/| |
* | | am d4b22ab4: status_t != boolMarco Nelissen2011-11-182-3/+3
|\ \ \ | |/ / |/| / | |/
| * status_t != boolMarco Nelissen2011-11-182-3/+3
* | Merge "Make sure not to cancel pending seek/EOS notifications on a cache unde...Andreas Huber2011-11-172-8/+9
|\ \
| * | Make sure not to cancel pending seek/EOS notifications on a cache underrun...Andreas Huber2011-11-162-8/+9
* | | No-op merge from ics-mr0The Android Open Source Project2011-11-160-0/+0
|\ \ \ | |/ / |/| / | |/
| * Reconcile with ics-factoryrom-2-releaseThe Android Open Source Project2011-11-160-0/+0
| |\
* | \ Merge "Fix for issue 5309336 -add videoeditor maximum prefetch YUV frames in...Hong Teng2011-11-152-8/+22
|\ \ \
| * | | Fix for issue 5309336Hong Teng2011-11-142-8/+22
* | | | Merge "audioflinger: fix noise when skipping to next song" into ics-mr1Eric Laurent2011-11-142-13/+35
|\ \ \ \
| * | | | audioflinger: fix noise when skipping to next songEric Laurent2011-11-112-13/+35
| |/ / /
* | | | Merge "Didn't mean to check this in..." into ics-mr1Andreas Huber2011-11-111-1/+1
|\ \ \ \
| * | | | Didn't mean to check this in...Andreas Huber2011-11-111-1/+1
* | | | | Merge "visualizer: reset buffer if playback is idle" into ics-mr1Eric Laurent2011-11-111-3/+25
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | visualizer: reset buffer if playback is idleEric Laurent2011-11-101-3/+25
| |/ / /
* | | | Merge "Instead of asserting, signal a runtime error if the session doesn't co...Andreas Huber2011-11-111-2/+15
|\ \ \ \
| * | | | Instead of asserting, signal a runtime error if the session doesn't containAndreas Huber2011-11-101-2/+15
| |/ / /
* | | | Merge "DO NOT MERGE: Instead of asserting, remove active streams if their soc...Andreas Huber2011-11-111-15/+47
|\ \ \ \
| * | | | DO NOT MERGE: Instead of asserting, remove active streams if their socketsAndreas Huber2011-11-101-15/+47
| |/ / /
* | | | Merge "Disconnect on socket error on the RTSP control connection." into ics-mr1Andreas Huber2011-11-112-64/+72
|\ \ \ \
| * | | | Disconnect on socket error on the RTSP control connection.Andreas Huber2011-11-102-64/+72
| |/ / /
* | | | Add support for retrieving location information in mp4/3gpp filesJames Dong2011-11-104-0/+38
|/ / /
* | | Merge "Send RTSP control connection keep-alive requests" into ics-mr1Andreas Huber2011-11-101-2/+92
|\ \ \