summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Don't include <linux/socket.h> directly.Elliott Hughes2012-09-112-2/+4
* Merge "Stop building the unused host libmtp static library."Elliott Hughes2012-09-111-28/+0
|\
| * Stop building the unused host libmtp static library.Elliott Hughes2012-09-111-28/+0
|/
* Merge "aacenc: Mark some global arrays const"Jean-Baptiste Queru2012-09-103-3/+3
|\
| * aacenc: Mark some global arrays constMartin Storsjo2012-09-093-3/+3
* | Merge "Fix libmedia and libstagefright to get expat header files from the app...Elliott Hughes2012-09-094-4/+2
|\ \ | |/ |/|
| * Fix libmedia and libstagefright to get expat header files from the approved l...Elliott Hughes2012-09-094-4/+2
|/
* Merge "OMXCodec: enhance error handling of OMX IL client"Jean-Baptiste Queru2012-08-311-2/+6
|\
| * OMXCodec: enhance error handling of OMX IL clientWeian Chen2012-08-311-2/+6
|/
* Merge "MPEG2TSWriter: Read more immediately if an empty buffer is received"Jean-Baptiste Queru2012-08-291-0/+2
|\
| * MPEG2TSWriter: Read more immediately if an empty buffer is receivedMartin Storsjo2012-08-291-0/+2
* | Merge "avcenc: Don't erase the InputBufferInfo before reading info from it"Jean-Baptiste Queru2012-08-291-1/+1
|\ \
| * | avcenc: Don't erase the InputBufferInfo before reading info from itMartin Storsjo2012-08-291-1/+1
| |/
* | Merge "recordvideo: Add an option for choosing software encoders"Jean-Baptiste Queru2012-08-291-2/+11
|\ \
| * | recordvideo: Add an option for choosing software encodersMartin Storsjo2012-08-291-2/+11
| |/
* | Merge "recordvideo: Sleep while waiting for the encoding to finish"Jean-Baptiste Queru2012-08-291-0/+1
|\ \ | |/ |/|
| * recordvideo: Sleep while waiting for the encoding to finishMartin Storsjo2012-08-291-0/+1
|/
* 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
* | 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
|/
* 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
* | 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
* | | 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
* | | Merge "avcenc: Properly indent assembly blocks"Jean-Baptiste Queru2012-08-213-18/+108
|\ \ \ | |/ /
| * | avcenc: Properly indent assembly blocksMartin Storsjo2012-08-203-18/+108
|/ /
* | Merge "hardening: eliminate text relocations from h264"Nick Kralevich2012-08-208-54/+94
|\ \
| * | hardening: eliminate text relocations from h264Ard Biesheuvel2012-08-138-54/+94
* | | 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
* | | | Merge "avcenc: Remove a leftover define"Jean-Baptiste Queru2012-08-201-1/+0
|\ \ \ \ | |/ / / |/| | |
| * | | avcenc: Remove a leftover defineMartin Storsjo2012-08-171-1/+0
|/ / /
* | | 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
* | | | Merge "stagefright amrnb: Move the bitstream_format enum into frame_type_3gpp.h"Jean-Baptiste Queru2012-08-164-36/+28
|\ \ \ \ | |/ / /
| * | | stagefright amrnb: Move the bitstream_format enum into frame_type_3gpp.hMartin Storsjo2012-07-104-36/+28
| | |/ | |/|
* | | Merge "hardening: eliminate text relocations from mp3"Jean-Baptiste Queru2012-08-163-7/+9
|\ \ \ | | |/ | |/|
| * | hardening: eliminate text relocations from mp3Ard Biesheuvel2012-08-133-7/+9
* | | Merge "avcenc: Clarify the ifdefs surrounding inline assembly"Jean-Baptiste Queru2012-08-164-4/+12
|\ \ \
| * | | avcenc: Clarify the ifdefs surrounding inline assemblyMartin Storsjo2012-07-104-4/+12
| | |/ | |/|
* | | Merge "hardening: eliminate text relocations from amrwb"Jean-Baptiste Queru2012-08-163-6/+12
|\ \ \ | | |/ | |/|
| * | hardening: eliminate text relocations from amrwbArd Biesheuvel2012-08-133-6/+12
* | | Merge "aacenc/amrwbenc: Remove the now unused LINUX define"Jean-Baptiste Queru2012-08-166-11/+1
|\ \ \
| * | | aacenc/amrwbenc: Remove the now unused LINUX defineMartin Storsjo2012-08-166-11/+1
* | | | Merge "aacenc/amrwbenc: Remove unused and dubious typedefs"Jean-Baptiste Queru2012-08-161-24/+0
|\ \ \ \ | |/ / /
| * | | aacenc/amrwbenc: Remove unused and dubious typedefsMartin Storsjo2012-08-161-24/+0
|/ / /
* | | Merge "MPEG2TSWriter: Correctly add padding using the adaptation field"Jean-Baptiste Queru2012-08-151-6/+27
|\ \ \