Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | | | Increased recorded MP4 max file size to 4GB | Rachad | 2014-02-10 | 1 | -3/+5 | |
* | | | | | | | | | | | Merge "fix the OS X builds until we can fix compiler warnings that apparently" | Andreas Huber | 2014-02-12 | 5 | -9/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | fix the OS X builds until we can fix compiler warnings that apparently | Andreas Huber | 2014-02-11 | 5 | -9/+1 | |
| | |/ / / / / / / / / | |/| | | | | | | | | | ||||||
* | | | | | | | | | | | fix the build by fixing more warnings. | Andreas Huber | 2014-02-11 | 3 | -7/+9 | |
|/ / / / / / / / / / | ||||||
* | | | | | | | | | | am 1c178d3e: am 7eacea11: Merge "avcenc: Only do startcode escaping if the ne... | Lajos Molnar | 2014-02-11 | 1 | -6/+9 | |
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | ||||||
| * | | | | | | | | | am 7eacea11: Merge "avcenc: Only do startcode escaping if the next byte requi... | Lajos Molnar | 2014-02-11 | 1 | -6/+9 | |
| |\ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | | | ||||||
| | * | | | | | | | | Merge "avcenc: Only do startcode escaping if the next byte requires it" | Lajos Molnar | 2014-02-11 | 1 | -6/+9 | |
| | |\ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | avcenc: Only do startcode escaping if the next byte requires it | Martin Storsjo | 2014-02-11 | 1 | -6/+9 | |
* | | | | | | | | | | | Merge "warnings be gone." | Andreas Huber | 2014-02-11 | 122 | -207/+446 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | warnings be gone. | Andreas Huber | 2014-02-11 | 122 | -207/+446 | |
| | |_|_|_|_|/ / / / / | |/| | | | | | | | | | ||||||
* | | | | | | | | | | | Merge "Support "data:" URIs again in mediaplayer..." | Andreas Huber | 2014-02-11 | 4 | -1/+118 | |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | Support "data:" URIs again in mediaplayer... | Andreas Huber | 2014-02-11 | 4 | -1/+118 | |
| |/ / / / / / / / / | ||||||
* | | | | | | | | | | Merge "fix delay when shutting down wifi display" | Chong Zhang | 2014-02-11 | 2 | -3/+5 | |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | fix delay when shutting down wifi display | Chong Zhang | 2014-02-07 | 2 | -3/+5 | |
* | | | | | | | | | | resolved conflicts for merge of 566be7c3 to master | Narayan Kamath | 2014-02-11 | 30 | -94/+104 | |
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | / / / / / | |_|_|_|/ / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | am 3c9130a8: Merge "Make frameworks/av 64-bit compatible" | Narayan Kamath | 2014-02-11 | 30 | -95/+105 | |
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | ||||||
| | * | | | | | | | Make frameworks/av 64-bit compatible | Kévin PETIT | 2014-02-11 | 30 | -95/+105 | |
| | | |/ / / / / | | |/| | | | | | ||||||
* | | | | | | | | Fix build after merge from AOSP | Glenn Kasten | 2014-02-10 | 1 | -8/+4 | |
* | | | | | | | | am 4e12dade: am 4361749d: Merge "AudioTrack: Never try to use the fast path i... | Glenn Kasten | 2014-02-10 | 1 | -0/+6 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | ||||||
| * | | | | | | | am 4361749d: Merge "AudioTrack: Never try to use the fast path if resampling ... | Glenn Kasten | 2014-02-10 | 1 | -0/+6 | |
| |\ \ \ \ \ \ \ | | |/ / / / / / | ||||||
| | * | | | | | | Merge "AudioTrack: Never try to use the fast path if resampling is required" | Glenn Kasten | 2014-02-10 | 1 | -0/+6 | |
| | |\ \ \ \ \ \ | ||||||
| | | * | | | | | | AudioTrack: Never try to use the fast path if resampling is required | Martin Storsjo | 2014-01-31 | 1 | -0/+6 | |
* | | | | | | | | | Merge "Fix regression" | Marco Nelissen | 2014-02-10 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Fix regression | Marco Nelissen | 2014-02-10 | 1 | -1/+1 | |
* | | | | | | | | | | am af8a3e29: am 7142d10a: Merge "avcenc: Update video port parameters in the ... | Lajos Molnar | 2014-02-10 | 1 | -0/+11 | |
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | ||||||
| * | | | | | | | | | am 7142d10a: Merge "avcenc: Update video port parameters in the base class" | Lajos Molnar | 2014-02-10 | 1 | -0/+11 | |
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | ||||||
| | * | | | | | | | | Merge "avcenc: Update video port parameters in the base class" | Lajos Molnar | 2014-02-10 | 1 | -0/+11 | |
| | |\ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | avcenc: Update video port parameters in the base class | Martin Storsjo | 2013-11-21 | 1 | -0/+11 | |
| * | | | | | | | | | | am 61bdaaa1: Merge "ChromiumHTTPDataSource: Keep track of the redirected URL" | Lajos Molnar | 2014-02-10 | 3 | -0/+7 | |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | ||||||
| | * | | | | | | | | | Merge "ChromiumHTTPDataSource: Keep track of the redirected URL" | Lajos Molnar | 2014-02-10 | 3 | -0/+7 | |
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ | | | |/| | | | | | | | ||||||
| | | * | | | | | | | | ChromiumHTTPDataSource: Keep track of the redirected URL | Martin Storsjo | 2013-11-25 | 3 | -0/+7 | |
* | | | | | | | | | | | am 25da2f09: am 88e99f9a: Merge "SoftVPXEncoder: Set the frame size on the ou... | Lajos Molnar | 2014-02-10 | 1 | -0/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | ||||||
| * | | | | | | | | | | am 88e99f9a: Merge "SoftVPXEncoder: Set the frame size on the output port as ... | Lajos Molnar | 2014-02-10 | 1 | -0/+3 | |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | ||||||
| | * | | | | | | | | | Merge "SoftVPXEncoder: Set the frame size on the output port as well" | Lajos Molnar | 2014-02-10 | 1 | -0/+3 | |
| | |\ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | SoftVPXEncoder: Set the frame size on the output port as well | Martin Storsjo | 2013-11-25 | 1 | -0/+3 | |
| | | |/ / / / / / / / | ||||||
| * | | | | | | | | | | am 44f2b8c2: Merge "M3UParser: Fix typo in 8883a38a308" | Marco Nelissen | 2014-02-10 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | ||||||
| | * | | | | | | | | | M3UParser: Fix typo in 8883a38a308 | Martin Storsjo | 2014-02-10 | 1 | -1/+1 | |
* | | | | | | | | | | | Fix build | Marco Nelissen | 2014-02-10 | 1 | -1/+1 | |
* | | | | | | | | | | | am 7cbaf3be: am 8519b8a1: Merge "M3UParser: Skip query strings when looking f... | Marco Nelissen | 2014-02-10 | 1 | -12/+22 | |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | / / / / / / | |_|_|_|/ / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | am 8519b8a1: Merge "M3UParser: Skip query strings when looking for the last s... | Marco Nelissen | 2014-02-10 | 1 | -12/+22 | |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | ||||||
| | * | | | | | | | | Merge "M3UParser: Skip query strings when looking for the last slash in a URL" | Marco Nelissen | 2014-02-10 | 1 | -12/+22 | |
| | |\ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | M3UParser: Skip query strings when looking for the last slash in a URL | Martin Storsjo | 2014-02-05 | 1 | -12/+22 | |
* | | | | | | | | | | | Merge "Use printf format %#x for audio_format_t in logs" | Glenn Kasten | 2014-02-10 | 3 | -7/+7 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Use printf format %#x for audio_format_t in logs | Glenn Kasten | 2014-02-07 | 3 | -7/+7 | |
* | | | | | | | | | | | | am 429f2bf7: am e2307ccb: Merge "frameworks/av: fix errors inside ALOGV" | Colin Cross | 2014-02-10 | 3 | -2/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | / | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | am e2307ccb: Merge "frameworks/av: fix errors inside ALOGV" | Colin Cross | 2014-02-07 | 4 | -5/+4 | |
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | | | ||||||
| | * | | | | | | | | | frameworks/av: fix errors inside ALOGV | Colin Cross | 2014-02-06 | 4 | -5/+4 | |
| | | |/ / / / / / / | | |/| | | | | | | | ||||||
| * | | | | | | | | | am dd432ce0: [DO NOT MERGE] Support TS + AC3 for ATSC standard | Changwan Ryu | 2014-02-04 | 5 | -0/+253 | |
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / | | |/| | | | | | | | ||||||
| | * | | | | | | | | [DO NOT MERGE] Support TS + AC3 for ATSC standard | Changwan Ryu | 2014-02-03 | 5 | -0/+253 | |
| * | | | | | | | | | am 90903383: [DO NOT MERGE] Support AC3 in stagefright | Changwan Ryu | 2014-02-04 | 2 | -1/+71 | |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / |