summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* media: 64 bit compile issuesMark Salyzyn2014-04-1528-221/+115
* Merge "Remove code markers"Dmitriy Ivanov2014-04-151-78/+0
|\
| * Remove code markersDmitriy Ivanov2014-04-151-78/+0
|/
* Merge "libstagefright: fix 64-bit warnings"Mark Salyzyn2014-04-1514-46/+54
|\
| * libstagefright: fix 64-bit warningsColin Cross2014-04-1414-46/+54
|/
* Merge "media: memset sizeof argument issues"Mark Salyzyn2014-04-143-3/+3
|\
| * media: memset sizeof argument issuesMark Salyzyn2014-04-113-3/+3
* | 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
|/
* Merge "build fix for aosp-idea133 @ 1119318"Mark Salyzyn2014-04-111-1/+0
|\
| * build fix for aosp-idea133 @ 1119318Mark Salyzyn2014-04-111-1/+0
* | Merge "warnings be gone (4/4)"Mark Salyzyn2014-04-111-2/+4
|\ \
| * | warnings be gone (4/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
|/ /
* | Merge "warnings be gone (2/4)"Mark Salyzyn2014-04-111-5/+5
|\ \ | |/ |/|
| * warnings be gone (2/4)Mark Salyzyn2014-04-111-5/+5
|/
* Merge "warnings be gone."Mark Salyzyn2014-04-1170-161/+211
|\
| * warnings be gone.Andreas Huber2014-04-1170-161/+211
|/
* 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
* | Merge "Fix aac decoder flush"Glenn Kasten2014-04-031-0/+6
|\ \ | |/
| * Fix aac decoder flushMarco Nelissen2014-04-021-0/+6
* | Merge "Fix decoder EOS handling"Glenn Kasten2014-04-026-203/+213
|\ \ | |/
| * Fix decoder EOS handlingMarco Nelissen2014-04-026-203/+213
|/
* Merge "CameraService: deadlock fix"Eino-Ville Talvala2014-03-251-0/+1
|\
| * CameraService: deadlock fixKalle Lampila2014-03-251-0/+1
|/
* Merge changes I9f28bc42,I135620e0Colin Cross2014-03-2220-70/+80
|\
| * libcameraservice: build 64-bitColin Cross2014-03-211-1/+0
| * libcameraservice: fix 64-bit print format warningsColin Cross2014-03-2119-69/+80
|/
* 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
* | Merge "Use libaudioresampler instead of libaudioflinger"Glenn Kasten2014-03-194-11/+3
|\ \ | |/
| * Use libaudioresampler instead of libaudioflingerGlenn Kasten2014-03-194-11/+3
* | Merge "Add libaudioresampler"Glenn Kasten2014-03-191-11/+18
|\ \ | |/
| * Add libaudioresamplerGlenn Kasten2014-03-191-11/+18
|/
* 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
|/
* Merge "AudioPolicyService: malloc/delete pair"Glenn Kasten2014-03-181-1/+1
|\
| * AudioPolicyService: malloc/delete pairYou Kim2013-09-121-1/+1
* | 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
|/ /
* | Merge "More 32-bit only"Glenn Kasten2014-03-171-0/+2
|\ \
| * | More 32-bit onlyGlenn Kasten2014-03-141-0/+2
|/ /
* | Merge "mediaserver and associated services are 32-bit only"Glenn Kasten2014-03-1414-0/+38
|\ \
| * | mediaserver and associated services are 32-bit onlyGlenn Kasten2014-03-1214-0/+38
* | | Merge "Implemented support for RTSP 301 Redirect"Andreas Huber2014-03-141-11/+22
|\ \ \ | |/ / |/| |
| * | Implemented support for RTSP 301 RedirectDavid Williams2012-12-031-11/+22
* | | Merge "Remove streaming URI from default logs"Marco Nelissen2014-03-125-6/+5
|\ \ \
| * | | Remove streaming URI from default logsDavid Williams2014-03-105-6/+5
|/ / /