summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* 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
| |\ \ \ | | |/ /
| | * | 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-2821-45/+271
|\ \ \ | |/ /
| * | am b7c8e918: Add support for HLS playlists of type \'event\'.Andreas Huber2012-11-2821-45/+271
| |\ \
| | * | Add support for HLS playlists of type 'event'.Andreas Huber2012-11-2721-45/+271
* | | | 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 5bc5bf39: am 79fd6853: Merge "MediaCodec: Add a method for getting the com...Andreas Huber2012-11-261-4/+40
|\ \ \ \ \ | |/ / / /
| * | | | am 79fd6853: Merge "MediaCodec: Add a method for getting the component name"Andreas Huber2012-11-261-4/+40
| |\ \ \ \ | | |/ / /
| | * | | Merge "MediaCodec: Add a method for getting the component name"Andreas Huber2012-11-261-4/+40
| | |\ \ \
| | | * | | MediaCodec: Add a method for getting the component nameMartin Storsjo2012-11-191-4/+40
| | | |/ /
| * | | | 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 b96c4b4c: am 2da6e4ae: Merge "Avoid memory leaks when handling metadata st...Marco Nelissen2012-11-201-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | am 2da6e4ae: 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 14dda623: am 7013209c: Merge "Handle large AVCC chunks"Andreas Huber2012-11-201-6/+4
|\ \ \ \ \ | |/ / / /
| * | | | 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 343f9c81: am dca2b5d7: Merge "Changed parsing of trkn and disk from 8 bits...Marco Nelissen2012-11-201-5/+7
|\ \ \ \ \ | |/ / / /
| * | | | 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
| | | |/ /
* | | | | Merge "Clean up channel count and channel mask"Glenn Kasten2012-11-192-26/+18
|\ \ \ \ \
| * | | | | Clean up channel count and channel maskGlenn Kasten2012-11-192-26/+18
* | | | | | delete -> freeMarco Nelissen2012-11-191-1/+1
|/ / / / /
* | | | | Merge ""if" statements use curly braces per media style"Glenn Kasten2012-11-162-20/+56
|\ \ \ \ \
| * | | | | "if" statements use curly braces per media styleGlenn Kasten2012-11-162-20/+56
* | | | | | Merge "Fix time vs. bytes units bug in getRenderPosition"Glenn Kasten2012-11-161-1/+1
|\ \ \ \ \ \
| * | | | | | Fix time vs. bytes units bug in getRenderPositionGlenn Kasten2012-11-161-1/+1
* | | | | | | Merge "Don't use control block frame count after create"Glenn Kasten2012-11-162-51/+59
|\ \ \ \ \ \ \
| * | | | | | | Don't use control block frame count after createGlenn Kasten2012-11-162-51/+59
| | |/ / / / / | |/| | | | |
* | | | | | | Merge "Don't explicitly log tid"Glenn Kasten2012-11-161-3/+3
|\ \ \ \ \ \ \
| * | | | | | | Don't explicitly log tidGlenn Kasten2012-11-161-3/+3
| |/ / / / / /
* | | | | | | Fix a crash when the stop might be called due to some error before start in R...James Dong2012-11-161-3/+4
|/ / / / / /
* | | | | | resolved conflicts for merge of 205d7249 to masterMarco Nelissen2012-11-161-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / /
| * | | | am da33d66e: 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
| | |/ /
* | | | Merge "Add GSM 6.10 decoder"Marco Nelissen2012-11-1611-11/+605
|\ \ \ \
| * | | | Add GSM 6.10 decoderMarco Nelissen2012-11-1611-11/+605
* | | | | Use size_t for frame countsGlenn Kasten2012-11-157-36/+48