summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* am bb1b7d5c: am 19998120: Merge "Bug 5478024 drop after decode if can\'t drop...Glenn Kasten2011-11-091-1/+1
|\
| * am 19998120: Merge "Bug 5478024 drop after decode if can\'t drop before" into...Glenn Kasten2011-11-091-1/+1
| |\
| | * Bug 5478024 drop after decode if can't drop beforeGlenn Kasten2011-11-041-1/+1
| | * DO NOT MERGE Poll input data with a small timeout and don't consume a full core.Andreas Huber2011-11-031-1/+1
* | | resolved conflicts for merge of 26f70db9 to masterAndreas Huber2011-11-0815-71/+0
|\ \ \ | |/ /
| * | Merge "Remove surface legacy APIs and code." into ics-mr1Andreas Huber2011-11-0815-71/+0
| |\ \
| | * | Remove surface legacy APIs and code.Andreas Huber2011-10-2815-71/+0
* | | | am 713c9a33: Merge "Fix 5509346: Resize the thumbnails if it\'s too large." i...Chih-Chung Chang2011-11-081-9/+18
|\ \ \ \ | |/ / /
| * | | Merge "Fix 5509346: Resize the thumbnails if it's too large." into ics-mr1Chih-Chung Chang2011-11-071-9/+18
| |\ \ \
| | * | | Fix 5509346: Resize the thumbnails if it's too large.Chih-Chung Chang2011-11-071-9/+18
* | | | | am ee7ebb32: Merge "Fix a hang issue where the first frame can be dropped for...James Dong2011-11-081-0/+6
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Fix a hang issue where the first frame can be dropped for timelapse vi...James Dong2011-11-071-0/+6
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Fix a hang issue where the first frame can be dropped for timelapse video rec...James Dong2011-10-261-0/+6
* | | | | Merge "Use binary search to discover closest sync sample index, replace"Andreas Huber2011-11-071-24/+25
|\ \ \ \ \
| * | | | | Use binary search to discover closest sync sample index, replaceAndreas Huber2011-11-071-24/+25
* | | | | | resolved conflicts for merge of 914972be to masterEric Laurent2011-11-051-17/+26
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge "Fix device management in lvm effect bundle wrapper." into ics-mr1Eric Laurent2011-11-041-17/+26
| |\ \ \ \ \
| | * | | | | Fix device management in lvm effect bundle wrapper.Eric Laurent2011-11-011-17/+26
* | | | | | | resolved conflicts for merge of 79178b8b to masterEric Laurent2011-11-051-9/+19
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "Fix problem in lvm effect bundle wrapper." into ics-mr1Eric Laurent2011-11-041-9/+19
| |\ \ \ \ \ \
| | * | | | | | Fix problem in lvm effect bundle wrapper.Eric Laurent2011-11-021-9/+19
* | | | | | | | am f51f1bd9: Verify we actually have valid utf8 metadataMarco Nelissen2011-11-031-1/+63
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Verify we actually have valid utf8 metadataMarco Nelissen2011-11-031-1/+63
* | | | | | | | am e395f645: Poll input data with a small timeout and don\'t consume a full c...Andreas Huber2011-11-031-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Poll input data with a small timeout and don't consume a full core.Andreas Huber2011-11-031-1/+1
* | | | | | | | am 1f85f1dc: Merge "Remove unreliable effect tests." into ics-mr1Eric Laurent2011-11-033-253/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | / / / / | |_|_|/ / / / |/| | | | | |
| * | | | | | Remove unreliable effect tests.Eric Laurent2011-11-023-253/+0
| |/ / / / /
* | | | | | am cd84197a: am 6e91e5b6: Merge "Fix volume indication in vibrate mode." into...Eric Laurent2011-11-011-2/+4
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 6e91e5b6: Merge "Fix volume indication in vibrate mode." into ics-mr0Eric Laurent2011-10-311-2/+4
| |\ \ \ \ \ | | |/ / / / | |/| | | / | | | |_|/ | | |/| |
| | * | | Fix volume indication in vibrate mode.Eric Laurent2011-10-311-2/+4
* | | | | Properly decode ADTS files with ID3 headers.Andreas Huber2011-11-013-12/+60
* | | | | Merge "Support new HLS byte-range extensions"Andreas Huber2011-11-014-6/+109
|\ \ \ \ \
| * | | | | Support new HLS byte-range extensionsAndreas Huber2011-10-314-6/+109
* | | | | | am 18936d7d: am 69e640ee: Merge "Bring back the old-style Ring/Vibrate/Silent...Amith Yamasani2011-10-311-8/+22
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / /
| * | | | am 69e640ee: Merge "Bring back the old-style Ring/Vibrate/Silent states when ...Amith Yamasani2011-10-301-8/+22
| |\ \ \ \ | | |/ / /
| | * | | Merge "Bring back the old-style Ring/Vibrate/Silent states when using volume ...Amith Yamasani2011-10-281-8/+22
| | |\ \ \
| | | * | | Bring back the old-style Ring/Vibrate/Silent states when using volume keys.Amith Yamasani2011-10-281-8/+22
* | | | | | am 74b2b954: am 09848bc8: Merge "docs: add developer guide cross references, ...Joe Fernandez2011-10-313-7/+22
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 09848bc8: Merge "docs: add developer guide cross references, Project ACRE,...Joe Fernandez2011-10-293-7/+22
| |\ \ \ \ \ | | |/ / / / | | | | | / | | |_|_|/ | |/| | |
| | * | | Merge "docs: add developer guide cross references, Project ACRE, round 3" int...Joe Fernandez2011-10-283-7/+22
| | |\ \ \ | | | |/ / | | |/| |
| | | * | docs: add developer guide cross references, Project ACRE, round 3Joe Fernandez2011-10-283-7/+22
* | | | | am 27ed1249: Merge "Properly report that we\'re no longer playing after recei...Andreas Huber2011-10-283-4/+17
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Properly report that we're no longer playing after receiving event" in...Andreas Huber2011-10-283-4/+17
| |\ \ \ \
| | * | | | Properly report that we're no longer playing after receiving eventAndreas Huber2011-10-263-4/+17
* | | | | | am fc9592f8: am 08479cee: Merge "Stagefright: ANW::connect in MediaPlayerServ...Jamie Gennis2011-10-283-97/+65
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 08479cee: Merge "Stagefright: ANW::connect in MediaPlayerService" into ics...Jamie Gennis2011-10-283-97/+65
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Stagefright: ANW::connect in MediaPlayerServiceJamie Gennis2011-10-263-97/+65
* | | | | | am da57c0e8: Merge "Report call status from AudioSource::start() to file writ...James Dong2011-10-272-2/+10
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Report call status from AudioSource::start() to file writer" into ics-mr1James Dong2011-10-272-2/+10
| |\ \ \ \ \
| | * | | | | Report call status from AudioSource::start() to file writerJames Dong2011-10-262-2/+10
| | | |_|_|/ | | |/| | |