summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* am 2613347d: Merge "Added support to query ACodec whether adaptive playback i...Lajos Molnar2014-03-071-0/+5
|\
| * Merge "Added support to query ACodec whether adaptive playback is enabled." i...Lajos Molnar2014-03-071-0/+5
| |\
| | * Added support to query ACodec whether adaptive playback is enabled.Robert Shih2014-03-061-0/+5
* | | am 909498b7: Merge "stagefright: use CODECS field in EXT-X_STREAM-INF as fall...Lajos Molnar2014-03-072-7/+157
|\ \ \ | |/ /
| * | Merge "stagefright: use CODECS field in EXT-X_STREAM-INF as fallback" into kl...Lajos Molnar2014-03-072-7/+157
| |\ \ | | |/
| | * stagefright: use CODECS field in EXT-X_STREAM-INF as fallbackRobert Shih2014-03-062-7/+157
* | | am 2338782d: Merge "Fixed misplaced bracket for switch-case block." into klp-devLajos Molnar2014-03-071-4/+4
|\ \ \ | |/ /
| * | Merge "Fixed misplaced bracket for switch-case block." into klp-devLajos Molnar2014-03-071-4/+4
| |\ \ | | |/
| | * Fixed misplaced bracket for switch-case block.Robert Shih2014-03-061-4/+4
* | | am ad21a81a: Merge "stagefright: Fix issue with tracking media format in pack...Lajos Molnar2014-03-072-13/+44
|\ \ \ | |/ /
| * | Merge "stagefright: Fix issue with tracking media format in packet source" in...Lajos Molnar2014-03-072-13/+44
| |\ \ | | |/
| | * stagefright: Fix issue with tracking media format in packet sourceLajos Molnar2014-03-062-13/+44
* | | am b74b2098: Merge "stagefright: Fix bugs in playlist fetcher logic" into klp...Lajos Molnar2014-03-072-29/+105
|\ \ \ | |/ /
| * | Merge "stagefright: Fix bugs in playlist fetcher logic" into klp-devLajos Molnar2014-03-072-29/+105
| |\ \ | | |/
| | * stagefright: Fix bugs in playlist fetcher logicLajos Molnar2014-03-062-29/+105
| * | Merge "stagefright: do not offload LD-AAC decoding" into klp-devEric Laurent2014-03-072-0/+14
| |\ \ | | |/ | |/|
| | * stagefright: do not offload LD-AAC decodingEric Laurent2014-03-062-0/+14
| * | Merge "stagefright: fix offloading HE-AAC sampling rate." into klp-devEric Laurent2014-03-061-17/+23
| |\ \ | | |/
| | * stagefright: fix offloading HE-AAC sampling rate.Eric Laurent2014-03-051-17/+23
* | | am af191eb4: Merge "Replace size_t in shared memory by uint32_t"Glenn Kasten2014-03-071-6/+13
|\ \ \
| * | | Replace size_t in shared memory by uint32_tGlenn Kasten2014-02-131-6/+13
* | | | am 7eacea11: Merge "avcenc: Only do startcode escaping if the next byte requi...Lajos Molnar2014-03-071-6/+9
|\ \ \ \ | |/ / /
| * | | Merge "avcenc: Only do startcode escaping if the next byte requires it"Lajos Molnar2014-02-111-6/+9
| |\ \ \
| | * | | avcenc: Only do startcode escaping if the next byte requires itMartin Storsjo2014-02-111-6/+9
* | | | | am 3c9130a8: Merge "Make frameworks/av 64-bit compatible"Narayan Kamath2014-03-0730-95/+105
|\ \ \ \ \ | |/ / / /
| * | | | Make frameworks/av 64-bit compatibleKévin PETIT2014-02-1130-95/+105
| |/ / /
* | | | am 4361749d: Merge "AudioTrack: Never try to use the fast path if resampling ...Glenn Kasten2014-03-071-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
* | | | | am 7142d10a: Merge "avcenc: Update video port parameters in the base class"Lajos Molnar2014-03-071-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-03-073-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 88e99f9a: Merge "SoftVPXEncoder: Set the frame size on the output port as ...Lajos Molnar2014-03-071-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-03-071-1/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | M3UParser: Fix typo in 8883a38a308Martin Storsjo2014-02-101-1/+1
* | | | | | | am 8519b8a1: Merge "M3UParser: Skip query strings when looking for the last s...Marco Nelissen2014-03-071-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
* | | | | | | | am e2307ccb: Merge "frameworks/av: fix errors inside ALOGV"Colin Cross2014-03-074-5/+4
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | frameworks/av: fix errors inside ALOGVColin Cross2014-02-064-5/+4
| |/ / / / / /
* | | | | | | am 5db1e3a6: Merge "correct one logic error in decide whether should render o...Lajos Molnar2014-03-072-2/+2
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | correct one logic error in decide whether should render or notJianzheng Zhou2014-02-032-2/+2
| | |_|/ / / | |/| | | |
| * | | | | fix deadlock issues that arise when there are simultaneousjpadmana2014-01-315-31/+88
* | | | | | am 3b7ddf83: set AAC MPEG version to MPEG-2Chong Zhang2014-03-061-1/+1
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | set AAC MPEG version to MPEG-2Chong Zhang2014-03-061-1/+1
| | |_|_|/ | |/| | |