summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | | | | 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
* | | | | | | | | | Merge "Use Format_isValid() and Format_isEqual() instead of direct comparison"Glenn Kasten2014-02-074-9/+9
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Use Format_isValid() and Format_isEqual() instead of direct comparisonGlenn Kasten2014-02-034-9/+9
* | | | | | | | | | Merge "Add Format_isValid() and Format_isEqual() to NBAIO"Glenn Kasten2014-02-071-0/+10
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | / / / / / / / | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Add Format_isValid() and Format_isEqual() to NBAIOGlenn Kasten2014-02-031-0/+10
* | | | | | | | | Merge "Remove libstagefright_http_support from the PDK build."Andreas Huber2014-02-061-0/+4
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Remove libstagefright_http_support from the PDK build.Andreas Huber2014-02-061-0/+4
* | | | | | | | | Merge "Change StagefrightRecorder to use MediaCodec"Chong Zhang2014-02-0610-196/+1152
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Change StagefrightRecorder to use MediaCodecChong Zhang2014-02-0510-196/+1152
* | | | | | | | | Merge "Fix restart after EOS for mp3"Marco Nelissen2014-02-061-0/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix restart after EOS for mp3Marco Nelissen2014-02-051-0/+3
* | | | | | | | | | Merge "Remove no longer needed http proxy handling code, it's obsolete now"Andreas Huber2014-02-0627-1655/+14
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Remove no longer needed http proxy handling code, it's obsolete nowAndreas Huber2014-02-0527-1655/+14
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge "Add AudioRecord::mReqFrameCount similar to AudioTrack"Glenn Kasten2014-02-051-7/+16
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Add AudioRecord::mReqFrameCount similar to AudioTrackGlenn Kasten2014-02-051-7/+16
| |/ / / / / / / /
* | | | | | | | | Merge "FINAL ATTEMPT: HTTP services are now provided from JAVA and made avail...Andreas Huber2014-02-0556-112/+827
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | FINAL ATTEMPT: HTTP services are now provided from JAVA and made available to...Andreas Huber2014-02-0456-112/+827
* | | | | | | | | Merge "Fix unused parameter warnings in audio"Glenn Kasten2014-02-045-6/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix unused parameter warnings in audioGlenn Kasten2014-02-035-6/+6
* | | | | | | | | | Merge "Change Format_Invalid from enum to global const"Glenn Kasten2014-02-041-0/+2
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |
| * | | | | | | | | Change Format_Invalid from enum to global constGlenn Kasten2014-02-031-0/+2