summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* Merge "b/4452171 Dumping video playbacks to files."Huahui Wu2011-05-268-0/+1143
|\
| * b/4452171 Dumping video playbacks to files.Huahui Wu2011-05-238-0/+1143
* | Merge "Extract embedded cover art (aka poster frame) in mp4 files"James Dong2011-05-263-2/+38
|\ \
| * | Extract embedded cover art (aka poster frame) in mp4 filesJames Dong2011-05-263-2/+38
* | | am c004a0c9: am 05e13b9e: am c1ded373: Merge "Revert "Use pread() to get the ...James Dong2011-05-261-7/+0
|\ \ \ | |/ / |/| |
| * | am 05e13b9e: am c1ded373: Merge "Revert "Use pread() to get the decrypted dat...James Dong2011-05-251-7/+0
| |\ \
| | * \ am c1ded373: Merge "Revert "Use pread() to get the decrypted data for contain...James Dong2011-05-251-7/+0
| | |\ \
| | | * | Revert "Use pread() to get the decrypted data for container based DRM file."James Dong2011-05-251-7/+0
* | | | | Merge "Support mpeg1,2 audio and mpeg1,2,4 video content extraction from .ts ...Andreas Huber2011-05-2617-280/+892
|\ \ \ \ \
| * | | | | Support mpeg1,2 audio and mpeg1,2,4 video content extraction from .ts streams.Andreas Huber2011-05-2517-280/+892
* | | | | | Merge "For out of band timed text support (timed text in a separate file)."Gloria Wang2011-05-2510-45/+542
|\ \ \ \ \ \
| * | | | | | For out of band timed text support (timed text in a separate file).Gloria Wang2011-05-2510-45/+542
| | |_|_|_|/ | |/| | | |
* | | | | | Merge "Issue 4364098: bluetooth SCO not working"Eric Laurent2011-05-251-5/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Issue 4364098: bluetooth SCO not workingEric Laurent2011-05-251-5/+1
* | | | | | Merge "Convert line breaks to Unix style"James Dong2011-05-25175-29631/+29631
|\ \ \ \ \ \
| * | | | | | Convert line breaks to Unix styleMans Rullgard2011-05-21175-29631/+29631
* | | | | | | Merge "Merge chromium to 10.0.634.0: Compile fix"Kristian Monsen2011-05-251-1/+1
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Merge chromium to 10.0.634.0: Compile fixKristian Monsen2011-05-251-1/+1
| | |/ / / / | |/| | | |
* | | | | | Bluetooth SCO audio API improvements.Eric Laurent2011-05-252-89/+258
* | | | | | Merge "Make sure all references to the decoder plugin are accounted for"Andreas Huber2011-05-244-2/+10
|\ \ \ \ \ \
| * | | | | | Make sure all references to the decoder plugin are accounted forAndreas Huber2011-05-244-2/+10
* | | | | | | Merge "Make sure the software mpeg4 decoder supports multiple input frames pe...Andreas Huber2011-05-242-8/+21
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Make sure the software mpeg4 decoder supports multiple input frames per input...Andreas Huber2011-05-242-8/+21
* | | | | | | am c41a17de: am 6e5cdca1: am ef89cc14: Merge "Multi-repository checkin, goes ...Jeffrey Tinker2011-05-242-19/+19
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | / / / | | |_|/ / / | |/| | | |
| * | | | | am 6e5cdca1: am ef89cc14: Merge "Multi-repository checkin, goes with https://...Jeffrey Tinker2011-05-232-19/+19
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | am ef89cc14: Merge "Multi-repository checkin, goes with https://android-git.c...Jeffrey Tinker2011-05-232-19/+19
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | | * | | Merge "Multi-repository checkin, goes with https://android-git.corp.google.co...Jeffrey Tinker2011-05-232-19/+19
| | | |\ \ \
| | | | * | | Multi-repository checkin, goes with https://android-git.corp.google.com/g/111038Jeffrey Tinker2011-05-232-19/+19
* | | | | | | resolved conflicts for merge of d5762583 to masterJames Dong2011-05-242-1/+7
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | / / | |_|_|_|/ / |/| | | | |
| * | | | | am ebae1923: am a5293d1c: Add some logging to track down where ANR happens du...James Dong2011-05-232-1/+7
| |\ \ \ \ \ | | |/ / / /
| | * | | | am a5293d1c: Add some logging to track down where ANR happens during MediaPla...James Dong2011-05-232-1/+7
| | |\ \ \ \ | | | |/ / /
| | | * | | Add some logging to track down where ANR happens during MediaPlayer._release().James Dong2011-05-232-1/+7
* | | | | | Merge "Bug 4184736 unhide MediaPlayer.setTexture"Glenn Kasten2011-05-201-1/+6
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Bug 4184736 unhide MediaPlayer.setTextureGlenn Kasten2011-05-201-1/+6
* | | | | | 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
* | | | | Merge "Publish setLocation() method as a public Java API"James Dong2011-05-191-5/+4
|\ \ \ \ \
| * | | | | Publish setLocation() method as a public Java APIJames Dong2011-05-181-5/+4
* | | | | | Merge "Add one more MIME type (audio/aac-adts) for aac file. Fix for bug 4463...Gloria Wang2011-05-191-0/+1
|\ \ \ \ \ \
| * | | | | | Add one more MIME type (audio/aac-adts) for aac file.Gloria Wang2011-05-191-0/+1
* | | | | | | 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 5a6c3d49: am 07e9267d: Merge "DO NOT MERGE For bug 4422428 Squashed commit...Gloria Wang2011-05-182-8/+4
| |\ \ \ \ \ \ \ | | |/ / / / / /
generated by cgit v1.1 at 2024-08-26 01:30:39 +0000