summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Convert line breaks to Unix styleMans Rullgard2011-05-21175-29631/+29631
* am 4d8ceada: am dbfd055d: am a6f1104b: Use pread() to get the decrypted data ...Gloria Wang2011-05-201-0/+7
|\
| * am dbfd055d: am a6f1104b: Use pread() to get the decrypted data for container...Gloria Wang2011-05-201-0/+7
| |\
| | * am a6f1104b: Use pread() to get the decrypted data for container based DRM fi...Gloria Wang2011-05-201-0/+7
| | |\
| | | * Use pread() to get the decrypted data for container based DRM file.Gloria Wang2011-05-201-0/+7
* | | | Merge "Merge Chromium at 10.0.621.0: Fixes for libstagefreight"Kristian Monsen2011-05-202-21/+23
|\ \ \ \
| * | | | Merge Chromium at 10.0.621.0: Fixes for libstagefreightKristian Monsen2011-05-132-21/+23
* | | | | resolved conflicts for merge of a8939e0d to masterJames Dong2011-05-194-30/+162
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | am 380244e9: am d148a499: Merge "Using widevine:// to stream adaptive bitrate...James Dong2011-05-184-29/+155
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | am d148a499: Merge "Using widevine:// to stream adaptive bitrate wvm content ...James Dong2011-05-184-29/+155
| | |\ \ \ | | | | |/ | | | |/|
| | | * | Merge "Using widevine:// to stream adaptive bitrate wvm content no longer" in...James Dong2011-05-184-29/+155
| | | |\ \
| | | | * | Using widevine:// to stream adaptive bitrate wvm content no longerAndreas Huber2011-05-104-29/+155
* | | | | | am 8d161fe1: (-s ours) am 5a6c3d49: am 07e9267d: Merge "DO NOT MERGE For bug ...Gloria Wang2011-05-190-0/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 5a6c3d49: am 07e9267d: Merge "DO NOT MERGE For bug 4422428 Squashed commit...Gloria Wang2011-05-184-17/+28
| |\ \ \ \ \ | | |/ / / /
| | * | | | am 07e9267d: Merge "DO NOT MERGE For bug 4422428 Squashed commit of the follo...Gloria Wang2011-05-184-17/+28
| | |\ \ \ \ | | | |/ / /
| | | * | | Merge "DO NOT MERGE For bug 4422428 Squashed commit of the following:" into h...Gloria Wang2011-05-184-17/+28
| | | |\ \ \
| | | | * | | DO NOT MERGEGloria Wang2011-05-134-17/+28
| | | | |/ /
* | | | | | Merge "Properly forward rotation information from input format to output form...Andreas Huber2011-05-181-2/+10
|\ \ \ \ \ \
| * | | | | | Properly forward rotation information from input format to output format.Andreas Huber2011-05-181-2/+10
* | | | | | | Merge "Add auto-white balance locking to the Camera API."Eino-Ville Talvala2011-05-182-15/+46
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Add auto-white balance locking to the Camera API.Eino-Ville Talvala2011-05-172-15/+46
* | | | | | | Revert "Add const to the finders method in MetaData.cpp"James Dong2011-05-174-14/+14
* | | | | | | Make track informational event optional, depending on system propertyJames Dong2011-05-172-0/+34
* | | | | | | am c9eb18bb: (-s ours) am bf81d4be: am c56e81c8: Merge "DO NOT MERGE: Properl...Andreas Huber2011-05-170-0/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | am bf81d4be: am c56e81c8: Merge "DO NOT MERGE: Properly construct the ESDS me...Andreas Huber2011-05-171-1/+7
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | am c56e81c8: Merge "DO NOT MERGE: Properly construct the ESDS metadata even i...Andreas Huber2011-05-171-1/+7
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | |
| | | * | | | Merge "DO NOT MERGE: Properly construct the ESDS metadata even if sizeof(code...Andreas Huber2011-05-171-1/+7
| | | |\ \ \ \
| | | | * | | | DO NOT MERGE: Properly construct the ESDS metadata even if sizeof(codec-speci...Andreas Huber2011-05-041-1/+7
| | | | | |/ / | | | | |/| |
* | | | | | | Claim support for .3gpp2 A/B files.Andreas Huber2011-05-171-0/+3
* | | | | | | Disable yuv->yuv mode and external display support until various driver fixes...Andreas Huber2011-05-162-1/+11
* | | | | | | Merge "Instead of using an RGB surface and conversion yuv420->rgb565"Andreas Huber2011-05-161-7/+58
|\ \ \ \ \ \ \
| * | | | | | | Instead of using an RGB surface and conversion yuv420->rgb565Andreas Huber2011-05-051-7/+58
* | | | | | | | resolved conflicts for merge of b107f4de to masterMike Lockwood2011-05-162-4/+8
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | am e23639e0: am 15afd076: Merge "MTP: Have GetStorageInfo command return corr...Mike Lockwood2011-05-162-4/+8
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | am 15afd076: Merge "MTP: Have GetStorageInfo command return correct storage t...Mike Lockwood2011-05-162-4/+8
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | |
| | | * | | | | MTP: Have GetStorageInfo command return correct storage type for removable st...Mike Lockwood2011-05-162-4/+8
| | | | |/ / / | | | |/| | |
* | | | | | | Merge "Fix module tags on stagefright software decoders."Andreas Huber2011-05-168-8/+8
|\ \ \ \ \ \ \
| * | | | | | | Fix module tags on stagefright software decoders.Andreas Huber2011-05-168-8/+8
* | | | | | | | Support platform and camera dependent recording start time offsetJames Dong2011-05-144-10/+37
|/ / / / / / /
* | | | | | | Merge "Add support for platform-specific recording start time offset"James Dong2011-05-132-0/+32
|\ \ \ \ \ \ \
| * | | | | | | Add support for platform-specific recording start time offsetJames Dong2011-05-102-0/+32
* | | | | | | | Support for storing geo information in the recorded mp4/3gpp file.James Dong2011-05-134-2/+156
* | | | | | | | Track id really starts with 1, not 0James Dong2011-05-131-1/+1
* | | | | | | | Merge "Add one more DRM error code. For bug 4422428."Gloria Wang2011-05-132-0/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Add one more DRM error code. For bug 4422428.Gloria Wang2011-05-132-0/+2
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge "Fix audio effect framework issues"Eric Laurent2011-05-132-28/+55
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Fix audio effect framework issuesEric Laurent2011-05-132-28/+55
* | | | | | | | Merge from honeycomb-plus-aospJean-Baptiste Queru2011-05-120-0/+0
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| * | | | | | | am 20fd3f0d: am 4770c79c: Merge "Tweak audio APIs for better forward/backward...Jean-Baptiste Queru2011-05-122-7/+7
| |\ \ \ \ \ \ \
| | * | | | | | | Tweak audio APIs for better forward/backward/sideways compatibility.Jean-Baptiste Queru2011-05-122-7/+7