summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* warnings be gone.Andreas Huber2014-02-11122-207/+446
* resolved conflicts for merge of 566be7c3 to masterNarayan Kamath2014-02-1130-94/+104
|\
| * am 3c9130a8: Merge "Make frameworks/av 64-bit compatible"Narayan Kamath2014-02-1130-95/+105
| |\
| | * Make frameworks/av 64-bit compatibleKévin PETIT2014-02-1130-95/+105
* | | Fix build after merge from AOSPGlenn Kasten2014-02-101-8/+4
* | | am 4e12dade: am 4361749d: Merge "AudioTrack: Never try to use the fast path i...Glenn Kasten2014-02-101-0/+6
|\ \ \ | |/ /
| * | am 4361749d: Merge "AudioTrack: Never try to use the fast path if resampling ...Glenn Kasten2014-02-101-0/+6
| |\ \ | | |/
| | * Merge "AudioTrack: Never try to use the fast path if resampling is required"Glenn Kasten2014-02-101-0/+6
| | |\
| | | * AudioTrack: Never try to use the fast path if resampling is requiredMartin Storsjo2014-01-311-0/+6
* | | | Merge "Fix regression"Marco Nelissen2014-02-101-1/+1
|\ \ \ \
| * | | | Fix regressionMarco Nelissen2014-02-101-1/+1
* | | | | am af8a3e29: am 7142d10a: Merge "avcenc: Update video port parameters in the ...Lajos Molnar2014-02-101-0/+11
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | am 7142d10a: Merge "avcenc: Update video port parameters in the base class"Lajos Molnar2014-02-101-0/+11
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Merge "avcenc: Update video port parameters in the base class"Lajos Molnar2014-02-101-0/+11
| | |\ \ \
| | | * | | avcenc: Update video port parameters in the base classMartin Storsjo2013-11-211-0/+11
| * | | | | am 61bdaaa1: Merge "ChromiumHTTPDataSource: Keep track of the redirected URL"Lajos Molnar2014-02-103-0/+7
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "ChromiumHTTPDataSource: Keep track of the redirected URL"Lajos Molnar2014-02-103-0/+7
| | |\ \ \ \
| | | * | | | ChromiumHTTPDataSource: Keep track of the redirected URLMartin Storsjo2013-11-253-0/+7
* | | | | | | am 25da2f09: am 88e99f9a: Merge "SoftVPXEncoder: Set the frame size on the ou...Lajos Molnar2014-02-101-0/+3
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 88e99f9a: Merge "SoftVPXEncoder: Set the frame size on the output port as ...Lajos Molnar2014-02-101-0/+3
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "SoftVPXEncoder: Set the frame size on the output port as well"Lajos Molnar2014-02-101-0/+3
| | |\ \ \ \ \
| | | * | | | | SoftVPXEncoder: Set the frame size on the output port as wellMartin Storsjo2013-11-251-0/+3
| | | |/ / / /
| * | | | | | am 44f2b8c2: Merge "M3UParser: Fix typo in 8883a38a308"Marco Nelissen2014-02-101-1/+1
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | M3UParser: Fix typo in 8883a38a308Martin Storsjo2014-02-101-1/+1
* | | | | | | Fix buildMarco Nelissen2014-02-101-1/+1
* | | | | | | am 7cbaf3be: am 8519b8a1: Merge "M3UParser: Skip query strings when looking f...Marco Nelissen2014-02-101-12/+22
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | / / | |_|_|_|/ / |/| | | | |
| * | | | | am 8519b8a1: Merge "M3UParser: Skip query strings when looking for the last s...Marco Nelissen2014-02-101-12/+22
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "M3UParser: Skip query strings when looking for the last slash in a URL"Marco Nelissen2014-02-101-12/+22
| | |\ \ \ \
| | | * | | | M3UParser: Skip query strings when looking for the last slash in a URLMartin Storsjo2014-02-051-12/+22
* | | | | | | Merge "Use printf format %#x for audio_format_t in logs"Glenn Kasten2014-02-103-7/+7
|\ \ \ \ \ \ \
| * | | | | | | Use printf format %#x for audio_format_t in logsGlenn Kasten2014-02-073-7/+7
* | | | | | | | am 429f2bf7: am e2307ccb: Merge "frameworks/av: fix errors inside ALOGV"Colin Cross2014-02-103-2/+4
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | am e2307ccb: Merge "frameworks/av: fix errors inside ALOGV"Colin Cross2014-02-074-5/+4
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | frameworks/av: fix errors inside ALOGVColin Cross2014-02-064-5/+4
| | | |/ / / / | | |/| | | |
| * | | | | | am dd432ce0: [DO NOT MERGE] Support TS + AC3 for ATSC standardChangwan Ryu2014-02-045-0/+253
| |\ \ \ \ \ \
| | * | | | | | [DO NOT MERGE] Support TS + AC3 for ATSC standardChangwan Ryu2014-02-035-0/+253
| * | | | | | | am 90903383: [DO NOT MERGE] Support AC3 in stagefrightChangwan Ryu2014-02-042-1/+71
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | [DO NOT MERGE] Support AC3 in stagefrightChangwan Ryu2014-02-032-1/+71
* | | | | | | | Merge "Fix warnings about unused parameters"Glenn Kasten2014-02-072-10/+16
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix warnings about unused parametersGlenn Kasten2014-02-072-10/+16
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge "Fix whitespace"Glenn Kasten2014-02-072-13/+26
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix whitespaceGlenn Kasten2014-02-072-13/+26
| |/ / / / / / /
* | | | | | | | Merge "set AAC MPEG version to MPEG-2"Chong Zhang2014-02-071-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | set AAC MPEG version to MPEG-2Chong Zhang2014-02-071-1/+1
* | | | | | | | | Merge "Change Format_frameBitShift() API for non-power-of-2 sizes"Glenn Kasten2014-02-071-1/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Change Format_frameBitShift() API for non-power-of-2 sizesGlenn Kasten2014-02-031-1/+2
* | | | | | | | | | Merge "Add FIXMEs about audio_format_t assumption"Glenn Kasten2014-02-071-0/+2
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Add FIXMEs about audio_format_t assumptionGlenn Kasten2014-02-031-0/+2
* | | | | | | | | | Merge "Change NBAIO_Format from typedef to struct"Glenn Kasten2014-02-071-6/+8
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Change NBAIO_Format from typedef to structGlenn Kasten2014-02-031-6/+8
generated by cgit v1.1 at 2024-05-03 01:51:40 +0000