summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* am 1b0ae9e4: Merge "avcenc: Set OMX_BUFFERFLAG_EOS on the last output frame"Jean-Baptiste Queru2012-09-121-0/+3
|\
| * Merge "avcenc: Set OMX_BUFFERFLAG_EOS on the last output frame"Jean-Baptiste Queru2012-09-121-0/+3
| |\
| | * avcenc: Set OMX_BUFFERFLAG_EOS on the last output frameMartin Storsjo2012-08-291-0/+3
* | | am fbe1cc92: Merge "Don\'t include <linux/socket.h> directly."Elliott Hughes2012-09-122-2/+4
|\ \ \ | |/ /
| * | Don't include <linux/socket.h> directly.Elliott Hughes2012-09-112-2/+4
* | | am 290ac693: 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
* | | am d81be6d6: Merge "aacenc: Mark some global arrays const"Jean-Baptiste Queru2012-09-103-3/+3
|\ \ \ | |/ /
| * | 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
* | | | am 5abc91d6: Merge "Fix libmedia and libstagefright to get expat header files...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
| |/ /
* | | am 8b152566: 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
* | | am 5b15adfe: Merge "MPEG2TSWriter: Read more immediately if an empty buffer i...Jean-Baptiste Queru2012-08-291-0/+2
|\ \ \ | |/ /
| * | 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
| | |/
* | | am 735d1b92: Merge "avcenc: Don\'t erase the InputBufferInfo before reading i...Jean-Baptiste Queru2012-08-291-1/+1
|\ \ \ | |/ /
| * | avcenc: Don't erase the InputBufferInfo before reading info from itMartin Storsjo2012-08-291-1/+1
| |/
* | 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 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
| |/
* | 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 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 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 9e13e927: Merge "avcenc: Properly indent assembly blocks"Jean-Baptiste Queru2012-08-213-18/+108
|\ \ \ | |/ /
| * | avcenc: Properly indent assembly blocksMartin Storsjo2012-08-203-18/+108
* | | 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 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 02a4ec21: Merge "avcenc: Remove a leftover define"Jean-Baptiste Queru2012-08-201-1/+0
|\ \ \ \ \ | |/ / / /
| * | | | avcenc: Remove a leftover defineMartin Storsjo2012-08-171-1/+0
| |/ / /
* | | | 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
* | | | | am c1d2777c: Merge "stagefright amrnb: Move the bitstream_format enum into fr...Jean-Baptiste Queru2012-08-164-36/+28
|\ \ \ \ \ | |/ / / /
| * | | | 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
| | | |/ | | |/|
* | | | am dde79acf: Merge "hardening: eliminate text relocations from mp3"Jean-Baptiste Queru2012-08-163-7/+9
|\ \ \ \ | |/ / /
| * | | Merge "hardening: eliminate text relocations from mp3"Jean-Baptiste Queru2012-08-163-7/+9
| |\ \ \ | | | |/ | | |/|