summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* 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 driverMike Lockwood2011-12-011-2/+4
* am 10526a0b: am 2c2ed7be: Merge "Fixes a typo in AVIExtractor that would adve...Andreas Huber2011-12-011-1/+1
|\
| * Fixes a typo in AVIExtractor that would advertise the wrong video dimensionsAndreas Huber2011-12-011-1/+1
* | am c040e1e7: am 6f1dd757: Merge "SurfaceMediaSource: use the vid enc usage bi...Jamie Gennis2011-11-301-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
* | | resolved conflicts for merge of 3d630e86 to masterAndreas Huber2011-11-302-2/+20
|\ \ \ | |/ /
| * | 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
* | | | Fix the broken buildJames Dong2011-11-291-3/+3
* | | | am 52607c53: am d12dc284: Merge "If an error occurs that prevents us from rea...Andreas Huber2011-11-291-0/+32
|\ \ \ \ | |/ / /
| * | | Merge "If an error occurs that prevents us from reallocating buffers during a...Andreas Huber2011-11-291-0/+32
| |\ \ \
| | * | | If an error occurs that prevents us from reallocating buffers during a format...Andreas Huber2011-11-281-0/+32
| | |/ /
* | | | am 074133b2: am 351143fb: Merge "Updated (internal) API for IStreamSource to ...Andreas Huber2011-11-292-7/+12
|\ \ \ \ | |/ / /
| * | | Merge "Updated (internal) API for IStreamSource to signal discontinuities" in...Andreas Huber2011-11-292-7/+12
| |\ \ \
| | * | | Updated (internal) API for IStreamSource to signal discontinuitiesAndreas Huber2011-11-292-7/+12
| | |/ /
* | | | resolved conflicts for merge of 998a929a to masterAndreas Huber2011-11-297-60/+151
|\ \ \ \ | |/ / /
| * | | Finer granularity discontinuity support.Andreas Huber2011-11-287-60/+151
| |/ /
* | | split ComposerService out of SurfaceComposerClient.hMathias Agopian2011-11-281-0/+2
* | | Merge "Fix a subtitle bug: multiple blank lines in SubRip(srt) file."James Dong2011-11-221-6/+11
|\ \ \
| * | | Fix a subtitle bug: multiple blank lines in SubRip(srt) file.Insun Kang2011-11-221-6/+11
* | | | am 31626b30: am cb6fbc89: Merge "Report a runtime error instead of asserting ...Andreas Huber2011-11-221-57/+87
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Merge "Report a runtime error instead of asserting on malformed avc configura...Andreas Huber2011-11-221-57/+87
| |\ \
| | * | Report a runtime error instead of asserting on malformed avc configuration data.Andreas Huber2011-11-181-57/+87
* | | | am d0a25456: am 02740dc4: Merge "Fix log spamming during time lapse video rec...James Dong2011-11-212-10/+15
|\ \ \ \ | |/ / /
| * | | Fix log spamming during time lapse video recordingJames Dong2011-11-212-10/+15
| | |/ | |/|
| * | am d4b22ab4: status_t != boolMarco Nelissen2011-11-182-3/+3
| |\ \ | | |/ | |/|
| | * status_t != boolMarco Nelissen2011-11-182-3/+3
* | | status_t != boolMarco Nelissen2011-11-182-3/+3
* | | am 624efe45: am c1b1709b: Merge "Make sure not to cancel pending seek/EOS not...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
* | | Merge "MidiFile uses C++ Thread not createThreadEtc"Glenn Kasten2011-11-172-7/+26
|\ \ \
| * | | MidiFile uses C++ Thread not createThreadEtcGlenn Kasten2011-11-162-7/+26
* | | | Merge "JetPlayer uses C++ Thread not createThreadEtc"Glenn Kasten2011-11-171-7/+2
|\ \ \ \
| * | | | JetPlayer uses C++ Thread not createThreadEtcGlenn Kasten2011-11-161-7/+2
| |/ / /
* | | | Bug 4903178 Restore priority and cgroup on stopGlenn Kasten2011-11-162-12/+24
|/ / /
* | | am 716747f7: am 481ffa50: Merge "Fix for issue 5309336 -add videoeditor maxi...Hong Teng2011-11-151-3/+7
|\ \ \ | |/ /
| * | Merge "Fix for issue 5309336 -add videoeditor maximum prefetch YUV frames in...Hong Teng2011-11-151-3/+7
| |\ \
| | * | Fix for issue 5309336Hong Teng2011-11-141-3/+7
* | | | am 8a065423: am 23217182: Merge "Didn\'t mean to check this in..." into ics-mr1Andreas Huber2011-11-111-1/+1
|\ \ \ \ | |/ / /
| * | | 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
* | | | | am 2c29a5cf: am 1f8c6212: Merge "visualizer: reset buffer if playback is idle...Eric Laurent2011-11-111-3/+25
|\ \ \ \ \ | |/ / / /
| * | | | 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
| | |/ /
* | | | am 40461ee7: am cd556b82: Merge "Instead of asserting, signal a runtime error...Andreas Huber2011-11-111-2/+15
|\ \ \ \ | |/ / /
| * | | 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
| |\ \ \