summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* am 839d11d1: Merge changes I0a744dc7,Id993a70dMark Salyzyn2014-04-1513-179/+62
|\
| * media: use size_t for integer iterator to Vector::size()Mark Salyzyn2014-04-153-5/+5
| * media: 64 bit compile issuesMark Salyzyn2014-04-1512-178/+61
* | am 432ed3d6: Merge "libstagefright: fix 64-bit warnings"Mark Salyzyn2014-04-1514-46/+54
|\ \ | |/
| * libstagefright: fix 64-bit warningsColin Cross2014-04-1414-46/+54
* | am 9829344d: Merge "media: memset sizeof argument issues"Mark Salyzyn2014-04-143-3/+3
|\ \ | |/
| * Merge "media: memset sizeof argument issues"Mark Salyzyn2014-04-143-3/+3
| |\
| | * media: memset sizeof argument issuesMark Salyzyn2014-04-113-3/+3
* | | am e5238893: Merge "Fix aosp_arm64 mirror-aosp-master build 1119326"Mark Salyzyn2014-04-113-6/+6
|\ \ \ | |/ /
| * | Fix aosp_arm64 mirror-aosp-master build 1119326Mark Salyzyn2014-04-113-6/+6
| |/
* | am a133bc87: Merge "build fix for aosp-idea133 @ 1119318"Mark Salyzyn2014-04-111-1/+0
|\ \ | |/
| * Merge "build fix for aosp-idea133 @ 1119318"Mark Salyzyn2014-04-111-1/+0
| |\
| | * build fix for aosp-idea133 @ 1119318Mark Salyzyn2014-04-111-1/+0
* | | am 0938c6f7: Merge "warnings be gone (4/4)"Mark Salyzyn2014-04-111-2/+4
|\ \ \ | |/ /
| * | warnings be gone (4/4)Mark Salyzyn2014-04-111-2/+4
* | | am 2a27a640: Merge "warnings be gone (3/4)"Mark Salyzyn2014-04-111-2/+4
|\ \ \ | |/ /
| * | warnings be gone (3/4)Mark Salyzyn2014-04-111-2/+4
* | | am 79724856: Merge "warnings be gone (2/4)"Mark Salyzyn2014-04-111-5/+5
|\ \ \ | |/ /
| * | warnings be gone (2/4)Mark Salyzyn2014-04-111-5/+5
| |/
* | am 52a861d2: Merge "warnings be gone."Mark Salyzyn2014-04-1169-160/+210
|\ \ | |/
| * warnings be gone.Andreas Huber2014-04-1169-160/+210
* | am 51b3ea2b: Merge "64-bit: Correction to OMX_U32 and OMX_S32"Glenn Kasten2014-04-037-16/+16
|\ \ | |/
| * 64-bit: Correction to OMX_U32 and OMX_S32Glenn Kasten2014-04-027-16/+16
* | am 93bbc834: Merge "Fix aac decoder flush"Glenn Kasten2014-04-031-0/+6
|\ \ | |/
| * Fix aac decoder flushMarco Nelissen2014-04-021-0/+6
* | am 81e0bd44: Add signature|system permission to MediaDrm signer APIsJeff Tinker2014-04-031-0/+16
|\ \
| * | Add signature|system permission to MediaDrm signer APIsJeff Tinker2014-04-021-0/+16
* | | am 2b2fbe29: Merge "Fix decoder EOS handling"Glenn Kasten2014-04-026-203/+213
|\ \ \ | | |/ | |/|
| * | Fix decoder EOS handlingMarco Nelissen2014-04-026-203/+213
* | | am 68d9d71a: Support CAST V2 Authentication in MediaDrmJeff Tinker2014-04-013-10/+94
|\ \ \ | | |/ | |/|
| * | Support CAST V2 Authentication in MediaDrmJeff Tinker2014-03-293-10/+94
* | | am 1000d426: am f780d28d: Merge "DO NOT MERGE: Revert "mediaplayer: keep more...Lajos Molnar2014-03-282-55/+30
|\ \ \ | |/ /
| * | am f780d28d: Merge "DO NOT MERGE: Revert "mediaplayer: keep more buffers with...Lajos Molnar2014-03-282-55/+30
| |\ \
| | * \ Merge "DO NOT MERGE: Revert "mediaplayer: keep more buffers with the BufferQu...Lajos Molnar2014-03-282-55/+30
| | |\ \
| | | * | DO NOT MERGE: Revert "mediaplayer: keep more buffers with the BufferQueue"Lajos Molnar2014-03-272-55/+30
* | | | | am 8bf96c01: am 3d4e4fcb: Merge "DO NOT MERGE: Revert "stagefright: allow for...Lajos Molnar2014-03-282-10/+7
|\ \ \ \ \ | |/ / / /
| * | | | am 3d4e4fcb: Merge "DO NOT MERGE: Revert "stagefright: allow for minUndequeue...Lajos Molnar2014-03-282-10/+7
| |\ \ \ \ | | |/ / /
| | * | | Merge "DO NOT MERGE: Revert "stagefright: allow for minUndequeuedBufs to be o...Lajos Molnar2014-03-282-10/+7
| | |\ \ \ | | | |/ /
| | | * | DO NOT MERGE: Revert "stagefright: allow for minUndequeuedBufs to be one less"Lajos Molnar2014-03-272-10/+7
* | | | | am 30890210: am 333ceb4f: Merge "DO NOT MERGE: PlaylistFetcher: fix infinite ...Lajos Molnar2014-03-211-0/+12
|\ \ \ \ \ | |/ / / /
| * | | | 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 1bfb8f76: am f622e2c7: Increased recorded MP4 max file size to 4GB (more p...Rachad2014-03-211-3/+5
|\ \ \ \ \ | |/ / / /
| * | | | 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 9ec86fa0: am a577eefb: am 5be9c1da: am 01eed3c0: am 7a107b85: am 854aa061:...Marco Nelissen2014-03-201-0/+1
|\ \ \ \ | |/ / /
| * | | 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
| | | |\ \