summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* media: Avoid collision with FFMPEG pluginstable/cm-12.1-caf-8084-YOG7Dstable/cm-12.1-caf-8084-YOG4Pstable/cm-12.1-caf-8084-YOG3Cstable/cm-12.0-caf-8084-YNG4Nstable/cm-12.0-caf-8084-YNG3Cstable/cm-12.0-caf-8084-YNG1TAstable/cm-12.0-caf-8084-YNG1Tcm-12.1-caf-8084cm-12.0-caf-8084Steve Kondik2014-12-041-0/+4
* Fix up rest of pathmapTony Layher2014-12-043-19/+19
* media: Use project pathmapEthan Chen2014-11-304-21/+26
* Merge "Merge tag 'AU_LINUX_ANDROID_LNX.LA.3.6.04.04.04.062.242' into HEAD"Linux Build Service Account2014-10-311-0/+14
|\
| * Merge tag 'AU_LINUX_ANDROID_LNX.LA.3.6.04.04.04.062.242' into HEADChiou-Hao Hsu2014-10-291-0/+14
|/|
| * Merge "mm-video: vidc: Drop events in error state"Linux Build Service Account2014-10-091-0/+14
| |\
| | * mm-video: vidc: Drop events in error stateDeva Ramasubramanian2014-10-071-0/+14
| |/
* | Merge "mm-core: synchronize OpenMax headers with AOSP counterparts"Linux Build Service Account2014-10-1811-32/+94
|\ \
| * | mm-core: synchronize OpenMax headers with AOSP counterpartsPraveen Chavan2014-09-3011-32/+94
* | | Merge "Merge tag 'AU_LINUX_ANDROID_LNX.LA.3.6.04.04.04.062.225' into HEAD"Linux Build Service Account2014-10-103-6/+22
|\ \ \
| * | | Merge tag 'AU_LINUX_ANDROID_LNX.LA.3.6.04.04.04.062.225' into HEADChiou-Hao Hsu2014-10-093-6/+22
|/| | | | | |/ | |/|
| * | Merge "mm-video: vidc: add the log when returning error in ftb"Linux Build Service Account2014-09-253-6/+22
| |\ \
| | * | mm-video: vidc: add the log when returning error in ftbJia Meng2014-07-253-6/+22
* | | | Merge "Merge tag 'AU_LINUX_ANDROID_LNX.LA.3.6.04.04.04.062.216' into HEAD"Linux Build Service Account2014-09-304-131/+141
|\ \ \ \ | |_|_|/ |/| | |
| * | | Merge tag 'AU_LINUX_ANDROID_LNX.LA.3.6.04.04.04.062.216' into HEADChiou-Hao Hsu2014-09-304-131/+141
|/| | | | |/ /
| * | Merge "mm-video: vdec: Separate meta buffers support in secure mode"Linux Build Service Account2014-09-184-131/+141
| |\ \
| | * | mm-video: vdec: Separate meta buffers support in secure modeSrinu Gorle2014-07-024-131/+141
* | | | Merge "Merge tag 'AU_LINUX_ANDROID_LNX.LA.3.6.04.04.04.062.207' into HEAD"Linux Build Service Account2014-09-183-3/+69
|\ \ \ \
| * | | | Merge tag 'AU_LINUX_ANDROID_LNX.LA.3.6.04.04.04.062.207' into HEADArchit Bhutani2014-09-153-3/+69
|/| | | | | |/ / /
| * | | Merge "mm-video: vidc: Possibly send not-coded-VOPs to the driver"Linux Build Service Account2014-09-123-1/+19
| |\ \ \
| | * | | mm-video: vidc: Possibly send not-coded-VOPs to the driverDeva Ramasubramanian2014-09-083-1/+19
| * | | | Merge "mm-video: vidc: Report corrupt EBDs"Linux Build Service Account2014-09-121-2/+3
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | mm-video: vidc: Report corrupt EBDsDeva Ramasubramanian2014-08-301-2/+3
| * | | | Merge "mm_video: vidc: Add support to set custom input buffer size"Linux Build Service Account2014-09-073-0/+47
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | mm_video: vidc: Add support to set custom input buffer sizePushkaraj Patil2014-08-253-0/+47
| |/ / /
* | | | Merge "QCMetadata: add key for pcm 24 bit"Linux Build Service Account2014-09-031-0/+1
|\ \ \ \
| * | | | QCMetadata: add key for pcm 24 bitAmit Shekhar2014-09-021-0/+1
|/ / / /
* | | | Merge "Merge tag 'AU_LINUX_ANDROID_LNX.LA.3.6.04.04.04.062.189' into HEAD"Linux Build Service Account2014-08-289-16/+390
|\ \ \ \
| * | | | Merge tag 'AU_LINUX_ANDROID_LNX.LA.3.6.04.04.04.062.189' into HEADPiyush Gupta2014-08-279-16/+390
|/| | | | | |/ / /
| * | | Merge "mm-video-v4l2: vidc: venc: Pass correct input buffers for gralloc source"Linux Build Service Account2014-08-123-9/+14
| |\ \ \
| | * | | mm-video-v4l2: vidc: venc: Pass correct input buffers for gralloc sourceArun Menon2014-08-113-9/+14
| |/ / /
| * | | Merge "mm-video: vidc: Expose OMX_QcomIndexConfigPerfLevel"Linux Build Service Account2014-08-083-1/+41
| |\ \ \
| | * | | mm-video: vidc: Expose OMX_QcomIndexConfigPerfLevelDeva Ramasubramanian2014-08-053-1/+41
| * | | | Merge "mm-video: venc: Add support for WFD controls"Linux Build Service Account2014-08-087-0/+326
| |\| | |
| | * | | mm-video: venc: Add support for WFD controlsSachin Shah2014-08-057-0/+326
| | | |/ | | |/|
| * | | Merge "mm-video: vidc: Make buffer state bitmap 64 bits"Linux Build Service Account2014-08-072-7/+10
| |\ \ \ | | |/ / | |/| |
| | * | mm-video: vidc: Make buffer state bitmap 64 bitsDeva Ramasubramanian2014-08-062-7/+10
| |/ /
* | | Merge "Merge tag 'AU_LINUX_ANDROID_LNX.LA.3.6.04.04.04.062.166' into HEAD"Linux Build Service Account2014-08-179-28/+311
|\ \ \
| * | | Merge tag 'AU_LINUX_ANDROID_LNX.LA.3.6.04.04.04.062.166' into HEADPiyush Gupta2014-08-129-28/+311
|/| | | | |/ /
| * | Merge "mm-video-v4l2: venc: add support to configure initial qp"Linux Build Service Account2014-07-246-6/+130
| |\ \
| | * | mm-video-v4l2: venc: add support to configure initial qpAshray Kulkarni2014-07-146-6/+130
| |/ /
| * | Merge "mm-video-v4l2: venc: Add LTR mode support for H264 video encoder"Linux Build Service Account2014-07-025-20/+120
| |\ \ | | |/ | |/|
| | * mm-video-v4l2: venc: Add LTR mode support for H264 video encoderSachin Shah2014-07-015-20/+120
| |/
| * Merge "mm-video: vidc: venc: make hier-p and ltr mutually exclusive"Linux Build Service Account2014-06-202-2/+24
| |\
| | * mm-video: vidc: venc: make hier-p and ltr mutually exclusiveArun Menon2014-06-172-2/+24
| |/
| * Merge "mm-video: add hevc secure decoder component on 8084"Linux Build Service Account2014-06-163-0/+37
| |\
| | * mm-video: add hevc secure decoder component on 8084Praveen Chavan2014-05-093-0/+37
* | | Merge "QCMetadata: add keys for FLAC meta data"Linux Build Service Account2014-07-171-0/+7
|\ \ \
| * | | QCMetadata: add keys for FLAC meta dataPraveen Chavan2014-07-121-0/+7
|/ / /
* | | Merge "Merge tag 'AU_LINUX_ANDROID_LNX.LA.3.6.04.04.02.062.122' into HEAD"Linux Build Service Account2014-06-182-4/+3
|\ \ \