summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | * | 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
|\ \ \ \ | |/ / /
| * | | 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
|\ \ \ \ \ | |/ / / /
| * | | | 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
| |\ \ \ | | | |/ | | |/|
| | * | hardening: eliminate text relocations from mp3Ard Biesheuvel2012-08-133-7/+9
* | | | am b7ca7dc9: Merge "avcenc: Clarify the ifdefs surrounding inline assembly"Jean-Baptiste Queru2012-08-164-4/+12
|\ \ \ \ | |/ / /
| * | | 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
| | | |/ | | |/|
* | | | am 4f981882: Merge "hardening: eliminate text relocations from amrwb"Jean-Baptiste Queru2012-08-163-6/+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
* | | | am c3bfa026: Merge "aacenc/amrwbenc: Remove the now unused LINUX define"Jean-Baptiste Queru2012-08-166-11/+1
|\ \ \ \ | |/ / /
| * | | 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
* | | | | am 3f5d2e17: Merge "aacenc/amrwbenc: Remove unused and dubious typedefs"Jean-Baptiste Queru2012-08-161-24/+0
|\ \ \ \ \ | |/ / / /
| * | | | 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
| |/ / /
* | | | am 2c3d9b7b: Merge "MPEG2TSWriter: Correctly add padding using the adaptation...Jean-Baptiste Queru2012-08-151-6/+27
|\ \ \ \ | |/ / /
| * | | Merge "MPEG2TSWriter: Correctly add padding using the adaptation field"Jean-Baptiste Queru2012-08-151-6/+27
| |\ \ \
| | * | | MPEG2TSWriter: Correctly add padding using the adaptation fieldPaul Fariello2012-08-151-6/+27
| |/ / /
* | | | am 98159acd: Merge "amrnb: Restart the p_xn pointer when retraversing the arr...Jean-Baptiste Queru2012-08-131-1/+2
|\ \ \ \ | |/ / /
| * | | Merge "amrnb: Restart the p_xn pointer when retraversing the array on overflow"Jean-Baptiste Queru2012-08-131-1/+2
| |\ \ \
| | * | | amrnb: Restart the p_xn pointer when retraversing the array on overflowMartin Storsjo2012-07-101-1/+2
| | | |/ | | |/|
* | | | am 5efa7bf9: Merge "amrnb: Fix audio distortion in an AMR-NB clip"Jean-Baptiste Queru2012-08-131-1/+1
|\ \ \ \ | |/ / /
| * | | Merge "amrnb: Fix audio distortion in an AMR-NB clip"Jean-Baptiste Queru2012-08-131-1/+1
| |\ \ \ | | |_|/ | |/| |
| | * | amrnb: Fix audio distortion in an AMR-NB clipPacketVideo CM2012-07-101-1/+1
| | |/
* | | am 24893fef: Merge "MPEG2TSWriter: Write a proper CRC in PAT and PMT"Jean-Baptiste Queru2012-08-102-6/+40
|\ \ \ | |/ /
| * | Merge "MPEG2TSWriter: Write a proper CRC in PAT and PMT"Jean-Baptiste Queru2012-08-102-6/+40
| |\ \
| | * | MPEG2TSWriter: Write a proper CRC in PAT and PMTPaul Fariello2012-07-102-6/+40
* | | | am 2001d2ac: Merge "MPEG2TSWriter: Write proper continuity counters for PAT a...Jean-Baptiste Queru2012-08-102-7/+19
|\ \ \ \ | |/ / /
| * | | Merge "MPEG2TSWriter: Write proper continuity counters for PAT and PMT"Jean-Baptiste Queru2012-08-102-7/+19
| |\ \ \ | | |/ /
| | * | MPEG2TSWriter: Write proper continuity counters for PAT and PMTPaul Fariello2012-07-102-7/+19
| | |/
* | | am c64a1787: Merge "Fix initialization of audio mixer track resources for MIPS."Jean-Baptiste Queru2012-08-101-1/+5
|\ \ \ | |/ /