summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* am 80b72e6f: Merge "libeffects: don\'t set module path"Colin Cross2014-02-141-1/+0
|\
| * libeffects: don't set module pathColin Cross2014-02-131-1/+0
* | am af191eb4: Merge "Replace size_t in shared memory by uint32_t"Glenn Kasten2014-02-131-6/+13
|\ \ | |/
| * Replace size_t in shared memory by uint32_tGlenn Kasten2014-02-131-6/+13
* | am 0105027f: Fix wrong channel table in ESQueue according to the A/52 table 5.8Dongwon Kang2014-02-131-1/+1
|\ \
| * | Fix wrong channel table in ESQueue according to the A/52 table 5.8Dongwon Kang2014-02-111-1/+1
* | | am 7eacea11: Merge "avcenc: Only do startcode escaping if the next byte requi...Lajos Molnar2014-02-111-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-02-1130-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-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
* | | | 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 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
* | | | | | 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
* | | | | | | 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
* | | | | | am 5db1e3a6: Merge "correct one logic error in decide whether should render o...Lajos Molnar2014-02-032-2/+2
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | correct one logic error in decide whether should render or notJianzheng Zhou2014-02-032-2/+2
| | |_|_|/ | |/| | |
* | | | | am c4eef29a: Merge "fix deadlock issues that arise when there are simultaneou...Eric Laurent2014-02-035-31/+88
|\ \ \ \ \ | |/ / / / | | / / / | |/ / / |/| | |
| * | | fix deadlock issues that arise when there are simultaneousjpadmana2014-01-315-31/+88
* | | | Merge "Support for MPEG2 video" into klp-modular-devDongwon Kang2014-01-292-0/+4
|\ \ \ \
| * | | | Support for MPEG2 videoChangwan Ryu2014-01-212-0/+4
* | | | | am 06da69d5: Merge "frameworks/av: convert LOCAL_MODULE_PATH to LOCAL_MODULE_...Colin Cross2014-01-287-9/+9
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | frameworks/av: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATHColin Cross2014-01-277-9/+9
* | | | | am 4ef1dc2d: Merge "Only increase the counter when we do take a wakelock"Eric Laurent2014-01-271-5/+7
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Only increase the counter when we do take a wakelock"Eric Laurent2014-01-271-5/+7
| |\ \ \ \
| | * | | | Only increase the counter when we do take a wakelockJimmy Dalqvist2014-01-221-5/+7
* | | | | | am d0e7e801: Merge "Do partial reads in MemoryLeakTrackUtil"Eric Laurent2014-01-271-3/+11
|\ \ \ \ \ \ | |/ / / / / | | | / / / | |_|/ / / |/| | | |
| * | | | Do partial reads in MemoryLeakTrackUtilOscar Rydhé2014-01-231-3/+11
| |/ / /
* | | | am 96a7b5a9: Merge "Long mp3 metadata displays as corrupted file after transfer"Marco Nelissen2014-01-173-18/+26
|\ \ \ \ | |/ / /
| * | | Merge "Long mp3 metadata displays as corrupted file after transfer"Marco Nelissen2014-01-173-18/+26
| |\ \ \
| | * | | Long mp3 metadata displays as corrupted file after transferYin Liu2013-12-203-18/+26