Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Skip scaling_list definitions in AVC seq header. | Andreas Huber | 2014-02-14 | 1 | -1/+37 |
* | am 8dad284a: am 80b72e6f: Merge "libeffects: don\'t set module path" | Colin Cross | 2014-02-14 | 1 | -1/+0 |
|\ | |||||
| * | am 80b72e6f: Merge "libeffects: don\'t set module path" | Colin Cross | 2014-02-14 | 1 | -1/+0 |
| |\ | |||||
| | * | libeffects: don't set module path | Colin Cross | 2014-02-13 | 1 | -1/+0 |
| * | | am af191eb4: Merge "Replace size_t in shared memory by uint32_t" | Glenn Kasten | 2014-02-13 | 1 | -6/+13 |
| |\ \ | | |/ | |||||
| | * | Replace size_t in shared memory by uint32_t | Glenn Kasten | 2014-02-13 | 1 | -6/+13 |
* | | | Merge "Track pid for each session" | Marco Nelissen | 2014-02-13 | 7 | -27/+49 |
|\ \ \ | |||||
| * | | | Track pid for each session | Marco Nelissen | 2014-02-11 | 7 | -27/+49 |
* | | | | Remove unused FragmentedMP4Parser and friends. The functionality has been | Andreas Huber | 2014-02-13 | 9 | -2986/+1 |
* | | | | am 49960807: am 0105027f: Fix wrong channel table in ESQueue according to the... | Dongwon Kang | 2014-02-13 | 1 | -1/+1 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | am 0105027f: Fix wrong channel table in ESQueue according to the A/52 table 5.8 | Dongwon Kang | 2014-02-13 | 1 | -1/+1 |
| |\ \ \ | |||||
| | * | | | Fix wrong channel table in ESQueue according to the A/52 table 5.8 | Dongwon Kang | 2014-02-11 | 1 | -1/+1 |
* | | | | | Merge "Even more warnings (now errors) fixed to unbreak the sdk-x86 build(s)." | Andreas Huber | 2014-02-12 | 4 | -3/+6 |
|\ \ \ \ \ | |||||
| * | | | | | Even more warnings (now errors) fixed to unbreak the sdk-x86 build(s). | Andreas Huber | 2014-02-12 | 4 | -3/+6 |
* | | | | | | Merge "Fix warnings (now errors) in YUVImage.cpp" | Andreas Huber | 2014-02-12 | 1 | -6/+6 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix warnings (now errors) in YUVImage.cpp | Andreas Huber | 2014-02-12 | 1 | -6/+6 |
| |/ / / / / | |||||
* | | | | | | Merge "Increased recorded MP4 max file size to 4GB (more precisely 2^32-1 byt... | Rachad | 2014-02-12 | 1 | -3/+5 |
|\ \ \ \ \ \ | |||||
| * | | | | | | 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 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / |