summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* Define CHANNEL_MASK_* in terms of AUDIO_CHANNEL_OUT_*Glenn Kasten2014-04-301-18/+7
* Remove AUDIO_CHANNEL_OUT_SURROUNDGlenn Kasten2014-04-302-64/+0
* Merge "PlaylistFetcher: clear mTSParser on bad starting seq # hint"Robert Shih2014-04-281-0/+1
|\
| * PlaylistFetcher: clear mTSParser on bad starting seq # hintRobert Shih2014-04-251-0/+1
* | AwesomePlayer: fixed division by zero in onBufferingUpdateRobert Shih2014-04-251-6/+4
* | Merge "Support VP8 encoder key frame interval and number of temporal layers c...Alex Glaznev2014-04-243-12/+394
|\ \
| * | Support VP8 encoder key frame interval and number ofAlex Glaznev2014-04-243-12/+394
* | | am 474038ae: am 27158eb5: Merge "AArch64: AString::append for longs and point...Nick Kralevich2014-04-211-21/+21
|\ \ \
| * \ \ am 27158eb5: Merge "AArch64: AString::append for longs and pointers"Nick Kralevich2014-04-211-21/+21
| |\ \ \
| | * \ \ Merge "AArch64: AString::append for longs and pointers"Nick Kralevich2014-04-211-21/+21
| | |\ \ \
| | | * | | AArch64: AString::append for longs and pointersMarcus Oakland2014-04-151-21/+21
* | | | | | Merge "BufferQueue: Increase max slots from 32 to 64"Dan Stoza2014-04-211-3/+5
|\ \ \ \ \ \
| * | | | | | BufferQueue: Increase max slots from 32 to 64Dan Stoza2014-04-111-3/+5
* | | | | | | 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
|\ \ \ \