summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am 839d11d1: Merge changes I0a744dc7,Id993a70dMark Salyzyn2014-04-1534-239/+133
|\
| * Merge changes I0a744dc7,Id993a70dMark Salyzyn2014-04-1534-239/+133
| |\
| | * media: use size_t for integer iterator to Vector::size()Mark Salyzyn2014-04-158-22/+22
| | * media: 64 bit compile issuesMark Salyzyn2014-04-1528-221/+115
| |/
* | am 1df2557a: Merge "Remove code markers"Dmitriy Ivanov2014-04-151-78/+0
|\ \ | |/
| * Merge "Remove code markers"Dmitriy Ivanov2014-04-151-78/+0
| |\
| | * Remove code markersDmitriy Ivanov2014-04-151-78/+0
| |/
* | am 432ed3d6: Merge "libstagefright: fix 64-bit warnings"Mark Salyzyn2014-04-1514-46/+54
|\ \ | |/
| * 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
|\ \ \ | |/ /
| * | 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
|\ \ \ | |/ /
| * | 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
|\ \ \ | |/ /
| * | 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
|\ \ \ | |/ /
| * | 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-1170-161/+211
|\ \ | |/
| * Merge "warnings be gone."Mark Salyzyn2014-04-1170-161/+211
| |\
| | * warnings be gone.Andreas Huber2014-04-1170-161/+211
| |/
* | am 51b3ea2b: Merge "64-bit: Correction to OMX_U32 and OMX_S32"Glenn Kasten2014-04-037-16/+16
|\ \ | |/
| * 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
|\ \ \ | |/ /
| * | 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
|\ \ \ \ | | |/ / | |/| |
| * | | 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-016-19/+154
|\ \ \ | | |/ | |/|
| * | Support CAST V2 Authentication in MediaDrmJeff Tinker2014-03-296-19/+154
* | | am 1000d426: am f780d28d: Merge "DO NOT MERGE: Revert "mediaplayer: keep more...Lajos Molnar2014-03-283-56/+30
|\ \ \ | |/ /
| * | am f780d28d: Merge "DO NOT MERGE: Revert "mediaplayer: keep more buffers with...Lajos Molnar2014-03-283-56/+30
| |\ \
| | * \ Merge "DO NOT MERGE: Revert "mediaplayer: keep more buffers with the BufferQu...Lajos Molnar2014-03-283-56/+30
| | |\ \
| | | * | DO NOT MERGE: Revert "mediaplayer: keep more buffers with the BufferQueue"Lajos Molnar2014-03-273-56/+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
| |\ \ \ \ | | |/ / /