summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix AMRWB test util and remove useless filesJames Dong2011-03-218-281/+13
* Enable http-live support for https:// urls, fix a parsing issue.Andreas Huber2011-03-212-3/+27
* Merge "Add read and write option in opening file for output in the writers"James Dong2011-03-212-2/+2
|\
| * Add read and write option in opening file for output in the writersJames Dong2011-03-212-2/+2
* | Merge "Fix for 4084554. DRM framework support for enabling/disabling copy con...Gloria Wang2011-03-212-188/+104
|\ \ | |/ |/|
| * Fix for 4084554.Gloria Wang2011-03-212-188/+104
* | Merge "Fix issue 3483718: audio streaming and A2DP."Eric Laurent2011-03-212-12/+33
|\ \ | |/ |/|
| * Fix issue 3483718: audio streaming and A2DP.Eric Laurent2011-03-212-12/+33
* | Merge "Support passing headers to MediaMetadataRetriever's setDataSource API"Andreas Huber2011-03-2111-18/+67
|\ \
| * | Support passing headers to MediaMetadataRetriever's setDataSource APIAndreas Huber2011-03-2111-18/+67
| |/
* | Scale the thumbnail if display dimension is different from the actual buffer ...James Dong2011-03-201-1/+9
|/
* Merge "Squashed commit of the following:"Andreas Huber2011-03-182-195/+145
|\
| * Squashed commit of the following:Andreas Huber2011-03-182-195/+145
* | am 2a102cce: (-s ours) am e68dc157: am a0dc8da2: Merge "DO NOT MERGE Send Web...Russell Brenner2011-03-180-0/+0
|\ \
| * \ am a0dc8da2: Merge "DO NOT MERGE Send WebView the current transform and wheth...Russell Brenner2011-03-181-0/+50
| |\ \
| | * | DO NOT MERGE Send WebView the current transform and whether we're drawing a l...Romain Guy2011-03-181-0/+50
* | | | Merge "Better organize media recorder error and information event and types"James Dong2011-03-184-38/+69
|\ \ \ \
| * | | | Better organize media recorder error and information event and typesJames Dong2011-03-184-38/+69
| | |_|/ | |/| |
* | | | Merge "Fix issue 4111672: AudioTrack control block flags"Eric Laurent2011-03-183-18/+40
|\ \ \ \
| * | | | Fix issue 4111672: AudioTrack control block flagsEric Laurent2011-03-183-18/+40
* | | | | Merge "Handle display dimension scaling event due to SAR embedded in AVC videos"James Dong2011-03-182-3/+49
|\ \ \ \ \
| * | | | | Handle display dimension scaling event due to SAR embedded in AVC videosJames Dong2011-03-182-3/+49
| | |/ / / | |/| | |
* | | | | Signal a runtime error if the AVCDecoder encounters an invalid frame.Andreas Huber2011-03-181-1/+2
|/ / / /
* | | | am 14438b81: am 970bad67: am be368de7: Merge "Fix missing AOSP copyright head...James Dong2011-03-174-0/+64
|\ \ \ \ | | |/ / | |/| |
| * | | am be368de7: Merge "Fix missing AOSP copyright headers for more files" into h...James Dong2011-03-174-0/+64
| |\ \ \ | | | |/ | | |/|
| | * | Fix missing AOSP copyright headers for more filesJames Dong2011-03-174-0/+64
* | | | Fix for bug 4126103.Gloria Wang2011-03-172-5/+5
* | | | am 782ffe91: am 9c0c5b56: am 2f1f2248: Fix missing AOSP copyright headers for...James Dong2011-03-1710-0/+159
|\ \ \ \ | |/ / /
| * | | am 2f1f2248: Fix missing AOSP copyright headers for a bunch of media framewor...James Dong2011-03-1710-0/+159
| |\ \ \ | | |/ /
| | * | Fix missing AOSP copyright headers for a bunch of media framework filesJames Dong2011-03-1710-0/+159
* | | | Send WebView the current transform and whether we're drawing a layer.Romain Guy2011-03-171-0/+50
| |_|/ |/| |
* | | Merge "Don't send the seek-complete notification twice."Andreas Huber2011-03-161-2/+1
|\ \ \
| * | | Don't send the seek-complete notification twice.Andreas Huber2011-03-161-2/+1
* | | | resolved conflicts for merge of 1cbf8493 to masterJames Dong2011-03-161-2/+4
|\ \ \ \ | | |/ / | |/| |
| * | | am fc591762: Merge "Add the default camera id to mCameraIds for emulator and ...James Dong2011-03-161-0/+5
| |\ \ \ | | | |/ | | |/|
| | * | Add the default camera id to mCameraIds for emulator and those devices withou...James Dong2011-03-161-0/+5
* | | | am 1a47fc35: (-s ours) am 7532ae7f: am 46956b06: Merge "DO NOT MERGE: Fix a r...Andreas Huber2011-03-160-0/+0
|\ \ \ \ | |/ / / | | | / | |_|/ |/| |
| * | am 46956b06: Merge "DO NOT MERGE: Fix a race condition when playing an audio-...Andreas Huber2011-03-161-12/+5
| |\ \ | | |/
| | * DO NOT MERGE: Fix a race condition when playing an audio-only stream and seek...Andreas Huber2011-03-161-12/+5
* | | Merge "Fix a race condition when playing an audio-only stream and seeking bef...Andreas Huber2011-03-161-12/+5
|\ \ \
| * | | Fix a race condition when playing an audio-only stream and seeking before sta...Andreas Huber2011-03-161-12/+5
* | | | am 9bb250bf: am a6c3ace3: am 3913c131: Merge "Improvement for issue 3489986: ...Eric Laurent2011-03-151-3/+11
|\ \ \ \ | | |/ / | |/| |
| * | | am 3913c131: Merge "Improvement for issue 3489986: BT SCO volume" into honeyc...Eric Laurent2011-03-151-3/+11
| |\ \ \ | | | |/ | | |/|
| | * | Merge "Improvement for issue 3489986: BT SCO volume" into honeycomb-mr1Eric Laurent2011-03-151-3/+11
| | |\ \
| | | * | Improvement for issue 3489986: BT SCO volumeEric Laurent2011-03-151-3/+11
* | | | | Merge "Bug fixes of DRM framework."Gloria Wang2011-03-156-19/+36
|\ \ \ \ \
| * | | | | Bug fixes of DRM framework.Gloria Wang2011-03-156-19/+36
* | | | | | am 7d7dcb5e: am 4528a7db: Merge "Bug 4016329 do full string comparisons" into...Glenn Kasten2011-03-155-162/+6
|\ \ \ \ \ \ | | |/ / / / | |/| | | / | |_|_|_|/ |/| | | |
| * | | | am 4528a7db: Merge "Bug 4016329 do full string comparisons" into honeycomb-mr1Glenn Kasten2011-03-155-162/+6
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Merge "Bug 4016329 do full string comparisons" into honeycomb-mr1Glenn Kasten2011-03-155-162/+6
| | |\ \ \
generated by cgit v1.1 at 2024-07-01 10:44:20 +0000