summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* Merge "SurfaceMediaSource: a few fixes / cleanups" into jb-mr1-devJamie Gennis2012-08-261-16/+12
|\
| * SurfaceMediaSource: a few fixes / cleanupsJamie Gennis2012-08-261-16/+12
* | Merge "Fix deadlock" into jb-mr1-devMarco Nelissen2012-08-241-1/+17
|\ \
| * | Fix deadlockMarco Nelissen2012-08-241-1/+17
| |/
* | Merge "Reduce THD when equalizer is ON." into jb-mr1-devEric Laurent2012-08-242-3/+5
|\ \ | |/ |/|
| * Reduce THD when equalizer is ON.Eric Laurent2012-08-242-3/+5
* | Merge "Allow directly setting a DataSource for NuMediaExtractor" into jb-mr1-devMarco Nelissen2012-08-241-3/+13
|\ \
| * | Allow directly setting a DataSource for NuMediaExtractorMarco Nelissen2012-08-241-3/+13
| |/
* | Merge "Add a missing NULL check." into jb-mr1-devJohn Grossman2012-08-241-1/+2
|\ \
| * | Add a missing NULL check.John Grossman2012-08-231-1/+2
| |/
* | am 07315f82: am 4b60ac04: Merge "Fixed redefinition of \'i\' with a different...Jean-Baptiste Queru2012-08-241-2/+2
|\ \
| * \ am 4b60ac04: Merge "Fixed redefinition of \'i\' with a different type error"Jean-Baptiste Queru2012-08-231-2/+2
| |\ \
| | * \ Merge "Fixed redefinition of 'i' with a different type error"Jean-Baptiste Queru2012-08-231-2/+2
| | |\ \
| | | * | Fixed redefinition of 'i' with a different type errorTareq A. Siraj2012-08-221-2/+2
* | | | | am 78015984: am 6e55a0f7: Merge "Fixed member access into incomplete type bui...Jean-Baptiste Queru2012-08-241-0/+1
|\ \ \ \ \ | |/ / / /
| * | | | am 6e55a0f7: Merge "Fixed member access into incomplete type build error"Jean-Baptiste Queru2012-08-231-0/+1
| |\ \ \ \ | | |/ / /
| | * | | Fixed member access into incomplete type build errorTareq A. Siraj2012-08-221-0/+1
| | |/ /
* | | | Send current bandwidth info event when buffering occursJeffrey Tinker2012-08-233-3/+21
| |_|/ |/| |
* | | am 8d4d590d: am 1e75e972: Merge "avcenc: Update a comment about the inline as...Jean-Baptiste Queru2012-08-213-6/+3
|\ \ \ | |/ /
| * | am 1e75e972: Merge "avcenc: Update a comment about the inline assembly"Jean-Baptiste Queru2012-08-213-6/+3
| |\ \ | | |/
| | * Merge "avcenc: Update a comment about the inline assembly"Jean-Baptiste Queru2012-08-213-6/+3
| | |\
| | | * avcenc: Update a comment about the inline assemblyMartin Storsjo2012-08-213-6/+3
* | | | am 8a825ec0: am aa411adf: Merge "h264 streaming: make profile-level-id optional"Jean-Baptiste Queru2012-08-211-8/+13
|\ \ \ \ | |/ / /
| * | | am aa411adf: Merge "h264 streaming: make profile-level-id optional"Jean-Baptiste Queru2012-08-211-8/+13
| |\ \ \ | | |/ /
| | * | Merge "h264 streaming: make profile-level-id optional"Jean-Baptiste Queru2012-08-211-8/+13
| | |\ \ | | | |/ | | |/|
| | | * h264 streaming: make profile-level-id optionalPatrik2 Carlsson2012-08-201-8/+13
* | | | am 41ee747f: am 5ebce52c: Merge "avcenc: Fix the gcc inline assembly constrai...Jean-Baptiste Queru2012-08-213-17/+17
|\ \ \ \ | |/ / /
| * | | am 5ebce52c: Merge "avcenc: Fix the gcc inline assembly constraints"Jean-Baptiste Queru2012-08-213-17/+17
| |\ \ \ | | |/ /
| | * | avcenc: Fix the gcc inline assembly constraintsMartin Storsjo2012-08-203-17/+17
* | | | am 894a7e45: am 9e13e927: Merge "avcenc: Properly indent assembly blocks"Jean-Baptiste Queru2012-08-213-18/+108
|\ \ \ \ | |/ / /
| * | | am 9e13e927: Merge "avcenc: Properly indent assembly blocks"Jean-Baptiste Queru2012-08-213-18/+108
| |\ \ \ | | |/ /
| | * | avcenc: Properly indent assembly blocksMartin Storsjo2012-08-203-18/+108
* | | | Merge "Revert "Swap the order of creating IAudioTrack and thread"" into jb-mr...Glenn Kasten2012-08-201-5/+10
|\ \ \ \
| * | | | Revert "Swap the order of creating IAudioTrack and thread"Glenn Kasten2012-08-071-5/+10
* | | | | am add7c4d3: am 46b7eeb8: Merge "hardening: eliminate text relocations from h...Nick Kralevich2012-08-208-54/+94
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | am 46b7eeb8: Merge "hardening: eliminate text relocations from h264"Nick Kralevich2012-08-208-54/+94
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Merge "hardening: eliminate text relocations from h264"Nick Kralevich2012-08-208-54/+94
| | |\ \ \
| | | * | | hardening: eliminate text relocations from h264Ard Biesheuvel2012-08-138-54/+94
* | | | | | am af5f9f05: am cd622346: Merge "MPEG2TSWriter: Fix an off-by-one in the cond...Jean-Baptiste Queru2012-08-201-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am cd622346: Merge "MPEG2TSWriter: Fix an off-by-one in the condition for pad...Jean-Baptiste Queru2012-08-201-1/+1
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "MPEG2TSWriter: Fix an off-by-one in the condition for padding"Jean-Baptiste Queru2012-08-201-1/+1
| | |\ \ \ \
| | | * | | | MPEG2TSWriter: Fix an off-by-one in the condition for paddingMartin Storsjo2012-08-201-1/+1
* | | | | | | am 3b939a5e: am 02a4ec21: Merge "avcenc: Remove a leftover define"Jean-Baptiste Queru2012-08-201-1/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 02a4ec21: Merge "avcenc: Remove a leftover define"Jean-Baptiste Queru2012-08-201-1/+0
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | avcenc: Remove a leftover defineMartin Storsjo2012-08-171-1/+0
| | |/ / / /
* | | | | | Don't log streaming url.James Dong2012-08-173-16/+4
* | | | | | am 523c09d5: am 64b3fe55: Merge "stagefright amrnb: Remove unused leftover so...Jean-Baptiste Queru2012-08-166-416/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 64b3fe55: Merge "stagefright amrnb: Remove unused leftover source files"Jean-Baptiste Queru2012-08-166-416/+2
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "stagefright amrnb: Remove unused leftover source files"Jean-Baptiste Queru2012-08-166-416/+2
| | |\ \ \ \
| | | * | | | stagefright amrnb: Remove unused leftover source filesMartin Storsjo2012-07-106-416/+2