summaryrefslogtreecommitdiffstats
path: root/media
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 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 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 07e9267d: Merge "DO NOT MERGE For bug 4422428 Squashed commit of the follo...Gloria Wang2011-05-182-8/+4
| |\ \ \ \ | | |/ / /
| | * | | Merge "DO NOT MERGE For bug 4422428 Squashed commit of the following:" into h...Gloria Wang2011-05-182-8/+4
| | |\ \ \
| | | * | | DO NOT MERGEGloria Wang2011-05-132-8/+4
| | | |/ /
| * | | | 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
| | | |/ /
* | | | | Properly forward rotation information from input format to output format.Andreas Huber2011-05-181-2/+10
* | | | | Revert "Add const to the finders method in MetaData.cpp"James Dong2011-05-172-7/+7
* | | | | Make track informational event optional, depending on system propertyJames Dong2011-05-171-0/+31
* | | | | 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 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
| | | |/ / | | |/| |
| | * | | DO NOT MERGE MediaScanner: Fix bug in "no media" handling logicMike Lockwood2011-05-031-3/+4
| | * | | DO NOT MERGE MTP: Implement GetThumb commandMike Lockwood2011-05-035-1/+34
| | * | | DO NOT MERGE MTP: Fix file descriptor leak in file editing extensionsMike Lockwood2011-05-032-24/+29
| | * | | DO NOT MERGE MTP: Add extended operations to support in-place editing of filesMike Lockwood2011-05-035-8/+268
| | * | | DO NOT MERGE MediaScanner: reimplement the ".nomedia" feature for hiding file...Mike Lockwood2011-05-031-13/+11
| | * | | DO NOT MERGE MTP and media provider support for multiple storage devices:Mike Lockwood2011-05-034-8/+9
| * | | | DO NOT MERGE MediaScanner: Fix bug in "no media" handling logicMike Lockwood2011-05-041-3/+4
| * | | | DO NOT MERGE MTP: Implement GetThumb commandMike Lockwood2011-05-045-1/+34
| * | | | DO NOT MERGE MTP: Fix file descriptor leak in file editing extensionsMike Lockwood2011-05-042-24/+29
| * | | | DO NOT MERGE MTP: Add extended operations to support in-place editing of filesMike Lockwood2011-05-045-8/+268
| * | | | DO NOT MERGE MediaScanner: reimplement the ".nomedia" feature for hiding file...Mike Lockwood2011-05-041-13/+11
| * | | | DO NOT MERGE MTP and media provider support for multiple storage devices:Mike Lockwood2011-05-044-8/+9
| * | | | am ec78f551: Add avg bandwidth estimate every 2 seconds - do not merge.James Dong2011-04-292-0/+12
| |\ \ \ \ | | |/ / /
| | * | | Add avg bandwidth estimate every 2 seconds - do not merge.James Dong2011-04-282-0/+12
* | | | | 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-143-10/+34
|/ / / / /
* | | | | Merge "Add support for platform-specific recording start time offset"James Dong2011-05-131-0/+23
|\ \ \ \ \
| * | | | | Add support for platform-specific recording start time offsetJames Dong2011-05-101-0/+23
* | | | | | Support for storing geo information in the recorded mp4/3gpp file.James Dong2011-05-133-2/+147
* | | | | | Track id really starts with 1, not 0James Dong2011-05-131-1/+1
| |_|_|_|/ |/| | | |
* | | | | update for new audio.h header locationDima Zavin2011-05-1211-11/+11
* | | | | Merge "A fix to the MPEG4Extractor to support 16-bit sample sizes."Andreas Huber2011-05-121-1/+1
|\ \ \ \ \
| * | | | | A fix to the MPEG4Extractor to support 16-bit sample sizes.Andreas Huber2011-05-121-1/+1