Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge "warnings be gone." | Andreas Huber | 2014-02-11 | 117 | -194/+431 |
|\ | |||||
| * | warnings be gone. | Andreas Huber | 2014-02-11 | 117 | -194/+431 |
* | | 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 | 18 | -57/+63 |
|\ \ | |||||
| * \ | am 3c9130a8: Merge "Make frameworks/av 64-bit compatible" | Narayan Kamath | 2014-02-11 | 18 | -57/+63 |
| |\ \ | |||||
| | * | | Make frameworks/av 64-bit compatible | Kévin PETIT | 2014-02-11 | 18 | -57/+63 |
* | | | | 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 |
* | | | | | | | am 429f2bf7: am e2307ccb: Merge "frameworks/av: fix errors inside ALOGV" | Colin Cross | 2014-02-10 | 2 | -1/+3 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | am e2307ccb: Merge "frameworks/av: fix errors inside ALOGV" | Colin Cross | 2014-02-07 | 3 | -4/+3 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | frameworks/av: fix errors inside ALOGV | Colin Cross | 2014-02-06 | 3 | -4/+3 |
| | |/ / / / | |||||
| * | | | | | 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 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | [DO NOT MERGE] Support AC3 in stagefright | Changwan Ryu | 2014-02-03 | 2 | -1/+71 |
* | | | | | | | Merge "set AAC MPEG version to MPEG-2" | Chong Zhang | 2014-02-07 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | set AAC MPEG version to MPEG-2 | Chong Zhang | 2014-02-07 | 1 | -1/+1 |
| | |_|_|_|_|/ | |/| | | | | | |||||
* | | | | | | | Merge "Remove libstagefright_http_support from the PDK build." | Andreas Huber | 2014-02-06 | 1 | -0/+4 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | Remove libstagefright_http_support from the PDK build. | Andreas Huber | 2014-02-06 | 1 | -0/+4 |
* | | | | | | | Merge "Change StagefrightRecorder to use MediaCodec" | Chong Zhang | 2014-02-06 | 8 | -20/+972 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | Change StagefrightRecorder to use MediaCodec | Chong Zhang | 2014-02-05 | 8 | -20/+972 |
* | | | | | | | Merge "Fix restart after EOS for mp3" | Marco Nelissen | 2014-02-06 | 1 | -0/+3 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Fix restart after EOS for mp3 | Marco Nelissen | 2014-02-05 | 1 | -0/+3 |
* | | | | | | | | Remove no longer needed http proxy handling code, it's obsolete now | Andreas Huber | 2014-02-05 | 17 | -1574/+6 |
| |/ / / / / / |/| | | | | | | |||||
* | | | | | | | Merge "FINAL ATTEMPT: HTTP services are now provided from JAVA and made avail... | Andreas Huber | 2014-02-05 | 25 | -63/+426 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | FINAL ATTEMPT: HTTP services are now provided from JAVA and made available to... | Andreas Huber | 2014-02-04 | 25 | -63/+426 |
* | | | | | | | Merge "Allow for larger codec private data" | Marco Nelissen | 2014-02-04 | 1 | -30/+50 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Allow for larger codec private data | Marco Nelissen | 2014-02-03 | 1 | -30/+50 |
| |/ / / / / / | |||||
* | | | | | | | Merge "MPEG4Writer: use "mp42" as major/minor brand in ftyp box." | Robert Shih | 2014-02-03 | 1 | -3/+6 |
|\ \ \ \ \ \ \ |