summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* am 333ceb4f: Merge "DO NOT MERGE: PlaylistFetcher: fix infinite loop when par...Lajos Molnar2014-03-211-0/+12
|\
| * Merge "DO NOT MERGE: PlaylistFetcher: fix infinite loop when parsing ADTS." i...Lajos Molnar2014-03-211-0/+12
| |\
| | * DO NOT MERGE: PlaylistFetcher: fix infinite loop when parsing ADTS.Robert Shih2014-03-211-0/+12
* | | am f622e2c7: Increased recorded MP4 max file size to 4GB (more precisely 2^32...Rachad2014-03-211-3/+5
|\ \ \ | |/ /
| * | Increased recorded MP4 max file size to 4GBRachad2014-03-211-3/+5
| |/
* | am a577eefb: am 5be9c1da: am 01eed3c0: am 7a107b85: am 854aa061: am 42ba5806:...Marco Nelissen2014-03-201-0/+1
|\ \ | |/
| * am 5be9c1da: am 01eed3c0: am 7a107b85: am 854aa061: am 42ba5806: am 72499628:...Marco Nelissen2014-03-201-0/+1
| |\
| | * am 01eed3c0: am 7a107b85: am 854aa061: am 42ba5806: am 72499628: am 25bab830:...Marco Nelissen2014-03-201-0/+1
| | |\
| | | * am 7a107b85: am 854aa061: am 42ba5806: am 72499628: am 25bab830: Fix buildMarco Nelissen2014-03-201-0/+1
| | | |\
| | | | * am 854aa061: am 42ba5806: am 72499628: am 25bab830: Fix buildMarco Nelissen2014-03-201-0/+1
| | | | |\
| | | | | * am 25bab830: Fix buildMarco Nelissen2014-03-201-0/+1
| | | | | |\
| | | | | | * Fix buildMarco Nelissen2014-03-201-0/+1
* | | | | | | am 2853e48c: am 6f65db14: am 0e0891f8: am 6cdc90b5: am ebc9b473: am fb49b8ba:...Marco Nelissen2014-03-201-1/+2
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 6f65db14: am 0e0891f8: am 6cdc90b5: am ebc9b473: am fb49b8ba: am dfd90c80:...Marco Nelissen2014-03-201-1/+2
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | am 0e0891f8: am 6cdc90b5: am ebc9b473: am fb49b8ba: am dfd90c80: am d434944b:...Marco Nelissen2014-03-201-2/+102
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | am 6cdc90b5: am ebc9b473: am fb49b8ba: am dfd90c80: am d434944b: am 3bc4f7ea:...Marco Nelissen2014-03-201-2/+102
| | | |\ \ \ \ | | | | |/ / /
| | | | * | | am ebc9b473: am fb49b8ba: am dfd90c80: am d434944b: am 3bc4f7ea: am 0c271b75:...Marco Nelissen2014-03-201-2/+102
| | | | |\ \ \ | | | | | |/ /
| | | | | * | am d434944b: am 3bc4f7ea: am 0c271b75: Verify certificatesMarco Nelissen2014-03-201-2/+102
| | | | | |\ \ | | | | | | |/
| | | | | | * am 3bc4f7ea: am 0c271b75: Verify certificatesMarco Nelissen2014-03-201-2/+102
| | | | | | |\
| | | | | | | * am 0c271b75: Verify certificatesMarco Nelissen2014-03-201-2/+102
| | | | | | | |\
| | | | | | | | * Verify certificatesMarco Nelissen2014-03-191-2/+102
| | | | | * | | | Bug fix for the MediaPlayer::prepare() api.Dylan Powers2012-11-293-5/+7
* | | | | | | | | 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
* | | | | | | | | | 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 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
* | | | | | | | | | 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 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 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 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
* | | | | | | | | | | 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 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 70cc5bdc: Merge changes Ic46e3069,Idc92716b into klp-devLajos Molnar2014-03-142-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Merge changes Ic46e3069,Idc92716b into klp-devLajos Molnar2014-03-122-1/+2
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | LiveSession: fix incorrect stream key (subtitle"s")Robert Shih2014-03-111-1/+1
| | * | | | | | | | | | | M3UParser: trim spaces when parsing comma separated codecs.Robert Shih2014-03-111-0/+1
* | | | | | | | | | | | | am 67a10c52: Merge "httplive: clear access units before returning from seekTo...Lajos Molnar2014-03-144-15/+42
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | Merge "httplive: clear access units before returning from seekTo." into klp-devLajos Molnar2014-03-124-15/+42
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / /
| | * | | | | | | | | | | httplive: clear access units before returning from seekTo.Robert Shih2014-03-114-15/+42
| | | |_|/ / / / / / / / | | |/| | | | | | | | |