summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* Merge "Fix build error when verbose logging is enabled"Glenn Kasten2011-12-151-1/+1
|\
| * Fix build error when verbose logging is enabledGlenn Kasten2011-12-151-1/+1
* | Merge "Fix indentation and whitespace"Glenn Kasten2011-12-142-26/+25
|\ \
| * | Fix indentation and whitespaceGlenn Kasten2011-12-142-26/+25
| |/
* | Merge "Audio C++ comments"Glenn Kasten2011-12-141-1/+1
|\ \
| * | Audio C++ commentsGlenn Kasten2011-12-141-1/+1
| |/
* | Merge "Remove unnecessary this->"Glenn Kasten2011-12-141-15/+15
|\ \
| * | Remove unnecessary this->Glenn Kasten2011-12-141-15/+15
| |/
* | Merge "Fix typo in error message, missing space"Glenn Kasten2011-12-141-1/+1
|\ \
| * | Fix typo in error message, missing spaceGlenn Kasten2011-12-141-1/+1
| |/
* | Merge "Delete obsolete includes"Glenn Kasten2011-12-141-6/+0
|\ \
| * | Delete obsolete includesGlenn Kasten2011-12-121-6/+0
| |/
* | Merge "Remove redundant clear()"Glenn Kasten2011-12-141-2/+0
|\ \
| * | Remove redundant clear()Glenn Kasten2011-12-141-2/+0
| |/
* | Merge "AudioTrack::setVolume check range"Glenn Kasten2011-12-141-1/+1
|\ \
| * | AudioTrack::setVolume check rangeGlenn Kasten2011-12-141-1/+1
| |/
* | am 3f6a7d1e: am d70c64db: Revert the following patches because they may lead ...James Dong2011-12-146-81/+25
|\ \
| * | Revert the following patches because they may lead to power regression becaus...James Dong2011-12-146-81/+25
| * | DO NOT MERGE: Support for parsing of "folded" RTSP header valuesAndreas Huber2011-12-132-9/+31
* | | am dc44e06e: am ef664f62: Merge "Fix drm flag setting missed in false drm rec...Jeff Tinker2011-12-121-0/+1
|\ \ \ | |/ /
| * | Fix drm flag setting missed in false drm recognition fix.Jeff Tinker2011-12-091-0/+1
* | | am 406dd5d1: am aadbd80b: Fixed the false drm recognition.James Dong2011-12-122-10/+17
|\ \ \ | |/ /
| * | Fixed the false drm recognition.James Dong2011-12-082-10/+17
* | | Merge "Support for parsing of "folded" RTSP header values and some tweaks to ...Andreas Huber2011-12-122-9/+31
|\ \ \
| * | | Support for parsing of "folded" RTSP header values and some tweaks to the AMR...Andreas Huber2011-12-092-9/+31
| | |/ | |/|
* | | Fix the build. (Change LOGV to ALOGV)Owen Lin2011-12-121-1/+1
* | | am ebfce84f: am 68f592a8: Merge "Don\'t perform RTSP seeks right away but que...Andreas Huber2011-12-092-4/+31
|\ \ \ | | |/ | |/|
| * | Merge "Don't perform RTSP seeks right away but queue them for 200ms" into ics...Andreas Huber2011-12-082-4/+31
| |\ \
| | * | Don't perform RTSP seeks right away but queue them for 200msAndreas Huber2011-12-082-4/+31
* | | | am aa82c39b: am 0ba9380a: Merge "Fix Bitreader "putBits" implementation, make...Andreas Huber2011-12-094-13/+37
|\ \ \ \ | |/ / /
| * | | Fix Bitreader "putBits" implementation, make sure we emulate timestampsAndreas Huber2011-12-084-13/+37
| |/ /
* | | am a5038d16: am a693a4b5: Merge "Fix ANRs due to Widevine DRM plugin sniff ta...Jeff Tinker2011-12-095-15/+63
|\ \ \ | |/ / | | / | |/ |/|
| * Merge "Fix ANRs due to Widevine DRM plugin sniff taking too long." into ics-mr1Jeff Tinker2011-12-085-15/+63
| |\
| | * Fix ANRs due to Widevine DRM plugin sniff taking too long.Jeff Tinker2011-12-075-15/+63
* | | Merge "Update onVideoSizeChanged() callback method Java doc to explicitly spe...James Dong2011-12-071-0/+3
|\ \ \
| * | | Update onVideoSizeChanged() callback method Java doc to explicitly specify th...James Dong2011-12-061-0/+3
* | | | Merge "Fix audio effect tests"Eric Laurent2011-12-073-0/+18
|\ \ \ \
| * | | | Fix audio effect testsEric Laurent2011-11-183-0/+18
* | | | | am 6727a43f: am 54a53841: Merge "Fetch at least 192KB to avoid our mp3 sniffe...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
* | | | | Merge "Allow data uris to be data sources"Narayan Kamath2011-12-074-2/+156
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Allow data uris to be data sourcesNarayan Kamath2011-12-064-2/+156
* | | | | am 2be608f8: am 6db79c35: Merge "Fix for issue 5712743 video editor functiona...Hong Teng2011-12-061-1/+1
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge "Fix for issue 5712743 video editor functional test : testPreviewDuring...Hong Teng2011-12-061-1/+1
| |\ \ \ \
| | * | | | Fix for issue 5712743 video editor functional test : testPreviewDuringExport ...Hong Teng2011-12-061-1/+1
* | | | | | am d49ec62c: am f3364080: Merge "New and improved silent mode on lockscreen."...Amith Yamasani2011-12-061-2/+8
|\ \ \ \ \ \ | |/ / / / / | | | / / / | |_|/ / / |/| | | |
| * | | | Merge "New and improved silent mode on lockscreen." into ics-mr1Amith Yamasani2011-12-061-2/+8
| |\ \ \ \
| | * | | | New and improved silent mode on lockscreen.Amith Yamasani2011-12-061-2/+8
| * | | | | 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
| | |/ / / /