summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am 2f6107ec: am b64def9a: Merge "[wfd] Support a low(er) power state by trigg...Andreas Huber2012-11-2910-30/+267
|\
| * am b64def9a: Merge "[wfd] Support a low(er) power state by triggering PAUSE/R...Andreas Huber2012-11-2910-30/+267
| |\
| | * Merge "[wfd] Support a low(er) power state by triggering PAUSE/RESUME." into ...Andreas Huber2012-11-2910-30/+267
| | |\
| | | * [wfd] Support a low(er) power state by triggering PAUSE/RESUME.Andreas Huber2012-11-2910-30/+267
* | | | am 5ea87edb: am e5aed03d: Enable retransmission of UDP packets in case we wan...Andreas Huber2012-11-291-1/+1
|\ \ \ \ | |/ / /
| * | | am e5aed03d: Enable retransmission of UDP packets in case we want to use itAndreas Huber2012-11-291-1/+1
| |\ \ \ | | |/ /
| | * | Enable retransmission of UDP packets in case we want to use itAndreas Huber2012-11-291-1/+1
| | |/
* | | am bd4f7b89: am 79c56d3f: Merge "Reduce the frequency of IDR frames and add i...James Dong2012-11-291-1/+18
|\ \ \ | |/ /
| * | am 79c56d3f: Merge "Reduce the frequency of IDR frames and add intra-fresh mo...James Dong2012-11-291-1/+18
| |\ \ | | |/
| | * Merge "Reduce the frequency of IDR frames and add intra-fresh mode support fo...James Dong2012-11-281-1/+18
| | |\
| | | * Reduce the frequency of IDR frames and add intra-fresh mode support for WiFi ...James Dong2012-11-281-1/+18
* | | | am 296cb9dd: am 0dbe5a93: Added optional intra macroblock refresh support for...James Dong2012-11-292-1/+50
|\ \ \ \ | |/ / /
| * | | am 0dbe5a93: Added optional intra macroblock refresh support for encodingJames Dong2012-11-292-1/+50
| |\ \ \ | | |/ /
| | * | Added optional intra macroblock refresh support for encodingJames Dong2012-11-282-1/+50
| | |/
* | | Merge "Clear the sticky EOS flags when transitioning to LOADED state"Andreas Huber2012-11-291-5/+5
|\ \ \
| * | | Clear the sticky EOS flags when transitioning to LOADED stateAndreas Huber2012-11-291-5/+5
* | | | am ce8dcdf5: am 031c93df: Merge "Bug fix for the MediaPlayer::prepare() api."Marco Nelissen2012-11-293-5/+7
|\ \ \ \ | | |/ / | |/| |
| * | | am 031c93df: Merge "Bug fix for the MediaPlayer::prepare() api."Marco Nelissen2012-11-293-5/+7
| |\ \ \
| | * \ \ Merge "Bug fix for the MediaPlayer::prepare() api."Marco Nelissen2012-11-293-5/+7
| | |\ \ \
| | | * | | Bug fix for the MediaPlayer::prepare() api.Dylan Powers2012-11-273-5/+7
* | | | | | am 37ddc8fc: am 251c04b1: Merge "Unsolicited server responses cause RTSP stre...Andreas Huber2012-11-291-0/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 251c04b1: Merge "Unsolicited server responses cause RTSP streaming to crash"Andreas Huber2012-11-291-0/+1
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "Unsolicited server responses cause RTSP streaming to crash"Andreas Huber2012-11-291-0/+1
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | Unsolicited server responses cause RTSP streaming to crashLena Magnusson2012-11-291-0/+1
| | |/ / /
* | | | | am 7b7f17dc: am b7c8e918: Add support for HLS playlists of type \'event\'.Andreas Huber2012-11-2823-46/+276
|\ \ \ \ \ | |/ / / /
| * | | | am b7c8e918: Add support for HLS playlists of type \'event\'.Andreas Huber2012-11-2823-46/+276
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Add support for HLS playlists of type 'event'.Andreas Huber2012-11-2723-46/+276
* | | | | Fix master build.Ben Murdoch2012-11-281-1/+1
* | | | | am 5d7b2778: resolved conflicts for merge of 41829f30 to jb-mr1-dev-plus-aospGlenn Kasten2012-11-270-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | resolved conflicts for merge of 41829f30 to jb-mr1-dev-plus-aospGlenn Kasten2012-11-2710-4870/+1341
| |\ \ \ \ | | |/ / /
| | * | | Merge "New VHQ resampler" into jb-mr1.1-devGlenn Kasten2012-11-2711-4818/+1427
| | |\ \ \
| | | * | | New VHQ resamplerGlenn Kasten2012-11-2711-4818/+1427
* | | | | | am b8fa1240: am aa9e3e01: Camera: Play shutter sound iff enableShutterSound(t...Igor Murashkin2012-11-273-9/+14
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am aa9e3e01: Camera: Play shutter sound iff enableShutterSound(true) && Shutt...Igor Murashkin2012-11-273-9/+14
| |\ \ \ \ \ | | |/ / / /
| | * | | | Camera: Play shutter sound iff enableShutterSound(true) && ShutterCallback !nullIgor Murashkin2012-11-263-9/+14
| | |/ / /
* | | | | am 8b5985d9: am 5768fa03: Merge "Crash in android::MyHandler::parsePlayResponse"Andreas Huber2012-11-271-0/+4
|\ \ \ \ \ | |/ / / /
| * | | | am 5768fa03: Merge "Crash in android::MyHandler::parsePlayResponse"Andreas Huber2012-11-271-0/+4
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Merge "Crash in android::MyHandler::parsePlayResponse"Andreas Huber2012-11-271-0/+4
| | |\ \ \
| | | * | | Crash in android::MyHandler::parsePlayResponsePatric Frederiksen2012-11-271-0/+4
* | | | | | am 9abbd0fb: am 3eb46d17: Merge "Fix of uninitialized mIsDrm variable."Andreas Huber2012-11-271-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 3eb46d17: Merge "Fix of uninitialized mIsDrm variable."Andreas Huber2012-11-271-1/+1
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "Fix of uninitialized mIsDrm variable."Andreas Huber2012-11-271-1/+1
| | |\ \ \ \
| | | * | | | Fix of uninitialized mIsDrm variable.Henrik B Andersson2012-11-271-1/+1
| | | |/ / /
* | | | | | am 5bc5bf39: am 79fd6853: Merge "MediaCodec: Add a method for getting the com...Andreas Huber2012-11-262-4/+44
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 79fd6853: Merge "MediaCodec: Add a method for getting the component name"Andreas Huber2012-11-262-4/+44
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "MediaCodec: Add a method for getting the component name"Andreas Huber2012-11-262-4/+44
| | |\ \ \ \
| | | * | | | MediaCodec: Add a method for getting the component nameMartin Storsjo2012-11-192-4/+44
| | | |/ / /
* | | | | | am 21006fa5: (-s ours) am 5865ddf7: Merge "AudioTrack::dump null mCblk check ...Marco Nelissen2012-11-260-0/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 5865ddf7: Merge "AudioTrack::dump null mCblk check test"Marco Nelissen2012-11-261-1/+1
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "AudioTrack::dump null mCblk check test"Marco Nelissen2012-11-261-1/+1
| | |\ \ \ \