summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* am f8dad0b3: am afd01086: Merge "Further volume improvements." into ics-mr1Amith Yamasani2011-12-021-8/+2
|\
| * Merge "Further volume improvements." into ics-mr1Amith Yamasani2011-12-021-8/+2
| |\
| | * Further volume improvements.Amith Yamasani2011-12-011-8/+2
* | | am 5126f1d4: am 613ed4c6: Merge "Fixd for 5490443 Native crash while exportin...Hong Teng2011-12-024-6/+51
|\ \ \ | |/ /
| * | Merge "Fixd for 5490443 Native crash while exporting a video - Add new onErro...Hong Teng2011-12-024-6/+51
| |\ \
| | * | Fixd for 5490443 Native crash while exporting a videoHong Teng2011-12-014-6/+51
* | | | Remove unused variable and imports in AudioManagerJean-Michel Trivi2011-12-021-6/+0
* | | | Merge "MTP: Add support for restricting PTP to only certain subdirectories of...Mike Lockwood2011-12-022-42/+157
|\ \ \ \
| * | | | MTP: Add support for restricting PTP to only certain subdirectories of the st...Mike Lockwood2011-12-022-42/+157
* | | | | Merge "MTP: Don't attempt to read more than 16K at a time from the MTP driver"Mike Lockwood2011-12-021-2/+4
|\ \ \ \ \ | |/ / / /
| * | | | MTP: Don't attempt to read more than 16K at a time from the MTP driverMike Lockwood2011-12-011-2/+4
* | | | | am 6cfa9e6c: am 0d3a2e93: Merge "AudioService: strengthen A2DP device detecti...Eric Laurent2011-12-011-159/+239
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | Merge "AudioService: strengthen A2DP device detection" into ics-mr1Eric Laurent2011-12-011-159/+239
| |\ \ \ | | |_|/ | |/| |
| | * | AudioService: strengthen A2DP device detectionEric Laurent2011-11-301-159/+239
| | |/
* | | Merge "Add README for media "automated" tests"Glenn Kasten2011-12-011-0/+10
|\ \ \
| * | | Add README for media "automated" testsGlenn Kasten2011-12-011-0/+10
* | | | 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
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Finer granularity discontinuity support." into ics-mr1Andreas Huber2011-11-297-60/+151
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Finer granularity discontinuity support.Andreas Huber2011-11-287-60/+151
| | |/ /
* | | | Merge changes If4126023,Iacda2386,I1eb691f7,Ib56139f8Mathias Agopian2011-11-291-0/+2
|\ \ \ \
| * | | | split ComposerService out of SurfaceComposerClient.hMathias Agopian2011-11-281-0/+2
* | | | | am 77d1ebbd: am 4e5d3f2c: Merge "Add the min fps option to set the min fps in...Yu Shan Emily Lau2011-11-283-65/+104
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | Add the min fps option to setYu Shan Emily Lau2011-11-283-65/+104
| |/ /
* | | 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 4d592c59: am eabde3d4: am fe464a76: [Prime K] Fix gabage character issuedujin.cha2011-11-221-0/+15
|\ \ \ \ | | |/ / | |/| |
| * | | am fe464a76: [Prime K] Fix gabage character issuedujin.cha2011-11-221-0/+15
| |\ \ \
| | * | | [Prime K] Fix gabage character issuedujin.cha2011-11-221-0/+15
* | | | | 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