summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* am e1ff1051: am e0f20cea: Merge "libeffects: 64 bit compile issues"Mark Salyzyn2014-04-182-39/+41
|\
| * am e0f20cea: Merge "libeffects: 64 bit compile issues"Mark Salyzyn2014-04-182-39/+41
| |\
| | * libeffects: 64 bit compile issuesMark Salyzyn2014-04-182-39/+41
* | | am f5f24006: am cd4eb72e: Merge "media: -Werror re-enabled"Mark Salyzyn2014-04-152-2/+2
|\ \ \ | |/ /
| * | am cd4eb72e: Merge "media: -Werror re-enabled"Mark Salyzyn2014-04-152-2/+2
| |\ \ | | |/
| | * Merge "media: -Werror re-enabled"Mark Salyzyn2014-04-152-2/+2
| | |\
| | | * media: -Werror re-enabledMark Salyzyn2014-04-152-2/+2
* | | | am e80631aa: am 839d11d1: Merge changes I0a744dc7,Id993a70dMark Salyzyn2014-04-1512-178/+61
|\ \ \ \ | |/ / /
| * | | 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 29fe1ea4: am 9829344d: Merge "media: memset sizeof argument issues"Mark Salyzyn2014-04-141-1/+1
|\ \ \ | |/ /
| * | 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 b1b1e303: am e5238893: Merge "Fix aosp_arm64 mirror-aosp-master build 1119...Mark Salyzyn2014-04-112-2/+2
|\ \ \ \ | |/ / /
| * | | 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
| | |/
* | | Revert "build fix for aosp-idea133 @ 1119318"Colin Cross2014-04-111-0/+1
* | | am a7281ee1: am a133bc87: Merge "build fix for aosp-idea133 @ 1119318"Mark Salyzyn2014-04-111-1/+0
|\ \ \ | |/ /
| * | 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
* | | stagefright: handle corrupt matroska files gracefullyLajos Molnar2014-04-041-5/+13
* | | stagefright: log uri protocols, and opt-in to log full uriLajos Molnar2014-04-046-15/+46
* | | stagefright: add AString constructor from String8Lajos Molnar2014-04-041-0/+8
* | | Merge "Remove deprecated BufferQueue constructor"Dan Stoza2014-04-046-41/+41
|\ \ \
| * | | Remove deprecated BufferQueue constructorDan Stoza2014-03-126-41/+41
* | | | Merge commit '52a23bd3' into manualmergeGlenn Kasten2014-04-037-15/+15
|\ \ \ \ | | |/ / | |/| |
| * | | 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 d009aa2b: am 81e0bd44: Add signature|system permission to MediaDrm signer ...Jeff Tinker2014-04-031-0/+16
|\ \ \ \ | |/ / /
| * | | 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
* | | | | Merge "ACodec: do not signal kWhatShutdownCompleted on codec error"Lajos Molnar2014-04-021-4/+12
|\ \ \ \ \
| * | | | | ACodec: do not signal kWhatShutdownCompleted on codec errorLajos Molnar2014-04-011-4/+12