summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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 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
* | | 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 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 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 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 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 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
| |\ \ \
| | * | | AudioTrack::dump null mCblk check testZbigniew Mazur2012-11-231-1/+1
| | |/ /
* | | | am 2da6e4ae: Merge "Avoid memory leaks when handling metadata strings"Marco Nelissen2012-11-201-1/+1
|\ \ \ \ | |/ / /
| * | | Merge "Avoid memory leaks when handling metadata strings"Marco Nelissen2012-11-201-1/+1
| |\ \ \
| | * | | Avoid memory leaks when handling metadata stringsDavid Williams2012-11-201-1/+1
| |/ / /
* | | | am 7013209c: Merge "Handle large AVCC chunks"Andreas Huber2012-11-201-6/+4
|\ \ \ \ | |/ / /
| * | | Merge "Handle large AVCC chunks"Andreas Huber2012-11-201-6/+4
| |\ \ \
| | * | | Handle large AVCC chunksJan Olof Svensson2012-11-191-6/+4
| | |/ /
* | | | am dca2b5d7: Merge "Changed parsing of trkn and disk from 8 bits to 16 bits"Marco Nelissen2012-11-201-5/+7
|\ \ \ \ | |/ / /
| * | | Merge "Changed parsing of trkn and disk from 8 bits to 16 bits"Marco Nelissen2012-11-201-5/+7
| |\ \ \
| | * | | Changed parsing of trkn and disk from 8 bits to 16 bitsAndreas Lillvik2012-11-191-5/+7
| | |/ /
* | | | am d983364b: Static AudioTrack plays twice initiallyGlenn Kasten2012-11-161-1/+1
|\ \ \ \ | | |_|/ | |/| |
| * | | Static AudioTrack plays twice initiallyGlenn Kasten2012-11-161-1/+1
* | | | am da33d66e: Merge "Add .mpga to acceptable file name extensions list."Marco Nelissen2012-11-161-1/+1
|\ \ \ \ | | |/ / | |/| |
| * | | Merge "Add .mpga to acceptable file name extensions list."Marco Nelissen2012-11-161-1/+1
| |\ \ \ | | |_|/ | |/| |
| | * | Add .mpga to acceptable file name extensions list.Jan Bjernler2012-11-161-1/+1
| |/ /
* | | am f0937247: Merge "Properly signal an error if codec configuration goes wron...Andreas Huber2012-11-141-1/+6
|\ \ \ | | |/ | |/|
| * | Merge "Properly signal an error if codec configuration goes wrong." into jb-m...Andreas Huber2012-11-141-1/+6
| |\ \
| | * | Properly signal an error if codec configuration goes wrong.Andreas Huber2012-11-141-1/+6
* | | | am 0224bf17: Various improvements of wifi display codeAndreas Huber2012-11-1416-302/+633
|\ \ \ \ | |/ / / | | | / | |_|/ |/| |
| * | Various improvements of wifi display codeAndreas Huber2012-11-1316-302/+633
| |/
* | am 78b012f5: Reconcile with jb-mr1-factory-release jb-mr1-release - do not mergeThe Android Open Source Project2012-11-060-0/+0
|\ \ | |/
| *-. Reconcile with jb-mr1-factory-release jb-mr1-release - do not mergeThe Android Open Source Project2012-11-060-0/+0
| |\ \
* | \ \ am 1c6833af: Ignore SIGPIPE during write() to broken pipeGlenn Kasten2012-11-061-0/+1
|\ \ \ \ | |/ / /
| * | | Ignore SIGPIPE during write() to broken pipeGlenn Kasten2012-11-061-0/+1
* | | | Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-11-020-0/+0
|\ \ \ \ | | |_|/ | |/| |
| * | | merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-11-010-0/+0
| |\ \ \ | | |/ / | |/| |
* | | | am 96076964: Make video encoders\' bitrate mode (constant, variable, ...) con...Andreas Huber2012-11-013-6/+28
|\ \ \ \ | |/ / /
| * | | Make video encoders' bitrate mode (constant, variable, ...) configurableAndreas Huber2012-11-013-6/+28
* | | | Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-11-010-0/+0
|\ \ \ \ | | |/ / | |/| |