summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* Use symbolic constants from <system/audio.h>Glenn Kasten2014-03-252-7/+7
* Fix operator precedenceGlenn Kasten2014-03-251-2/+2
* mtp: avoid silent allocation overflow in MtpPropertyLajos Molnar2014-03-241-1/+8
* Merge "stagefright: initial media_codecs_google*.xml files"Lajos Molnar2014-03-213-0/+88
|\
| * stagefright: initial media_codecs_google*.xml filesLajos Molnar2014-03-193-0/+88
* | Merge "A few fixes in SW VP8 encoder:"Alex Glaznev2014-03-202-17/+77
|\ \
| * | A few fixes in SW VP8 encoder:Alex Glaznev2014-03-192-17/+77
* | | libstagefright: fix 64-bit warningsColin Cross2014-03-1919-73/+87
* | | Merge "Add MediaPlayer::getAudioStreamType."John Spurlock2014-03-191-0/+8
|\ \ \
| * | | Add MediaPlayer::getAudioStreamType.John Spurlock2014-03-191-0/+8
| | |/ | |/|
* | | Merge commit 'c250980f' into manualmergeGlenn Kasten2014-03-196-11/+0
|\ \ \
| * \ \ am 24e1bd71: Merge "libstagefright is no longer 32 bit only."Glenn Kasten2014-03-197-13/+0
| |\ \ \
| | * | | libstagefright is no longer 32 bit only.Narayan Kamath2014-03-197-13/+0
* | | | | Merge "Use more tags to help the ICU detector."Marco Nelissen2014-03-192-20/+99
|\ \ \ \ \
| * | | | | Use more tags to help the ICU detector.Marco Nelissen2014-03-192-20/+99
* | | | | | am bd1f8f0a: am fb28c384: am 1faa4170: stagefright: allow for minUndequeuedBu...Lajos Molnar2014-03-192-7/+10
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | am fb28c384: am 1faa4170: stagefright: allow for minUndequeuedBufs to be one ...Lajos Molnar2014-03-192-7/+10
| |\ \ \ \ \
| | * \ \ \ \ am 1faa4170: stagefright: allow for minUndequeuedBufs to be one lessLajos Molnar2014-03-192-7/+10
| | |\ \ \ \ \
| | | * | | | | stagefright: allow for minUndequeuedBufs to be one lessLajos Molnar2014-03-192-7/+10
| * | | | | | | am 9cde5172: am b635b0e6: mediaplayer: keep more buffers with the BufferQueueLajos Molnar2014-03-192-30/+55
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | am b635b0e6: mediaplayer: keep more buffers with the BufferQueueLajos Molnar2014-03-192-30/+55
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | mediaplayer: keep more buffers with the BufferQueueLajos Molnar2014-03-192-30/+55
* | | | | | | | stagefright: add include support for MediaCodecList xml parserLajos Molnar2014-03-191-38/+104
| |_|_|_|_|/ / |/| | | | | |
* | | | | | | am 49b2e310: am a1f0c62c: am 43ca783e: httplive: block-by-block fetch, decryp...Robert Shih2014-03-195-188/+285
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am a1f0c62c: am 43ca783e: httplive: block-by-block fetch, decrypt, and parse ...Robert Shih2014-03-195-188/+285
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | am 43ca783e: httplive: block-by-block fetch, decrypt, and parse ts files.Robert Shih2014-03-195-188/+285
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | httplive: block-by-block fetch, decrypt, and parse ts files.Robert Shih2014-03-195-188/+285
* | | | | | | am c7c839dc: am b2ecad7f: Merge "libstagefright_foundation: fix printf format...Colin Cross2014-03-181-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | / | |_|_|_|_|/ |/| | | | |
| * | | | | am b2ecad7f: Merge "libstagefright_foundation: fix printf format for 64-bit"Colin Cross2014-03-181-1/+1
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | libstagefright_foundation: fix printf format for 64-bitColin Cross2014-03-181-1/+1
* | | | | | am 098b28fc: am 64727dd7: Merge "More precise 32-bit only for libstagefright/...Glenn Kasten2014-03-185-0/+10
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 64727dd7: Merge "More precise 32-bit only for libstagefright/ subdirectories"Glenn Kasten2014-03-185-0/+10
| |\ \ \ \ \ | | |/ / / /
| | * | | | More precise 32-bit only for libstagefright/ subdirectoriesGlenn Kasten2014-03-175-0/+10
| * | | | | am 8788c40c: am 75dcf510: Merge "Verify certificates" into klp-devMarco Nelissen2014-03-142-1/+101
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | am 75dcf510: Merge "Verify certificates" into klp-devMarco Nelissen2014-03-142-1/+101
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | Merge "Verify certificates" into klp-devMarco Nelissen2014-03-142-1/+101
| | | |\ \ \
| | | | * | | Verify certificatesMarco Nelissen2014-03-132-1/+101
* | | | | | | Merge "move audio policy service to a separate library"Eric Laurent2014-03-181-0/+2
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | move audio policy service to a separate libraryEric Laurent2014-03-111-0/+2
* | | | | | | Remove name output parameter from createTrackGlenn Kasten2014-03-142-8/+2
* | | | | | | resolved conflicts for merge of 3c780188 to masterGlenn Kasten2014-03-145-0/+8
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | am 089affb6: Merge "mediaserver and associated services are 32-bit only"Glenn Kasten2014-03-146-0/+10
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | * | | | | Merge "mediaserver and associated services are 32-bit only"Glenn Kasten2014-03-146-0/+10
| | |\ \ \ \ \
| | | * | | | | mediaserver and associated services are 32-bit onlyGlenn Kasten2014-03-126-0/+10
* | | | | | | | am f1ac623f: am 4a67fc49: Merge "Implemented support for RTSP 301 Redirect"Andreas Huber2014-03-141-11/+22
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 4a67fc49: Merge "Implemented support for RTSP 301 Redirect"Andreas Huber2014-03-141-11/+22
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge "Implemented support for RTSP 301 Redirect"Andreas Huber2014-03-141-11/+22
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | | * | | | | Implemented support for RTSP 301 RedirectDavid Williams2012-12-031-11/+22
| * | | | | | | am 466786b2: am 70cc5bdc: Merge changes Ic46e3069,Idc92716b into klp-devLajos Molnar2014-03-142-1/+2
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | |
| | * | | | | | am 70cc5bdc: Merge changes Ic46e3069,Idc92716b into klp-devLajos Molnar2014-03-142-1/+2
| | |\ \ \ \ \ \ | | | | |_|_|/ / | | | |/| | | |