summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* am be9a7055: Merge "stagefright aacenc: Remove a stray semicolon"Jean-Baptiste Queru2012-02-271-1/+1
|\
| * Merge "stagefright aacenc: Remove a stray semicolon"Jean-Baptiste Queru2012-02-271-1/+1
| |\
| | * stagefright aacenc: Remove a stray semicolonMartin Storsjo2012-02-241-1/+1
* | | am fe5f5d77: Merge "stagefright amrwb: Make a global const array static"Jean-Baptiste Queru2012-02-271-1/+1
|\ \ \ | |/ /
| * | Merge "stagefright amrwb: Make a global const array static"Jean-Baptiste Queru2012-02-271-1/+1
| |\ \
| | * | stagefright amrwb: Make a global const array staticMartin Storsjo2012-02-241-1/+1
| | |/
* | | am 94ee1bf2: Merge "stagefright amrwbenc: Change keyword ordering"Jean-Baptiste Queru2012-02-271-2/+2
|\ \ \ | |/ /
| * | Merge "stagefright amrwbenc: Change keyword ordering"Jean-Baptiste Queru2012-02-271-2/+2
| |\ \
| | * | stagefright amrwbenc: Change keyword orderingMartin Storsjo2012-02-241-2/+2
| | |/
* | | am 5aff259c: Merge "stagefright aacenc: Don\'t address a Word32 with a Word16...Jean-Baptiste Queru2012-02-271-1/+1
|\ \ \ | |/ /
| * | Merge "stagefright aacenc: Don't address a Word32 with a Word16 pointer"Jean-Baptiste Queru2012-02-271-1/+1
| |\ \ | | |/ | |/|
| | * stagefright aacenc: Don't address a Word32 with a Word16 pointerMartin Storsjo2012-01-131-1/+1
* | | am 6a300a54: Merge "stagefright aacenc: Make the bits to write in WriteBits u...Jean-Baptiste Queru2012-02-242-2/+2
|\ \ \ | |/ /
| * | Merge "stagefright aacenc: Make the bits to write in WriteBits unsigned"Jean-Baptiste Queru2012-02-242-2/+2
| |\ \
| | * | stagefright aacenc: Make the bits to write in WriteBits unsignedMartin Storsjo2012-01-132-2/+2
| | |/
* | | am d6a25154: Merge "stagefright aacenc: Fix an inline asm constraint"Jean-Baptiste Queru2012-02-241-1/+1
|\ \ \ | |/ /
| * | Merge "stagefright aacenc: Fix an inline asm constraint"Jean-Baptiste Queru2012-02-241-1/+1
| |\ \
| | * | stagefright aacenc: Fix an inline asm constraintMartin Storsjo2012-01-131-1/+1
| | |/
* | | am ea227787: Merge changes I903353c5,I822dcc74Jean-Baptiste Queru2012-02-242-3/+3
|\ \ \ | |/ /
| * | Merge changes I903353c5,I822dcc74Jean-Baptiste Queru2012-02-242-3/+3
| |\ \
| | * | stagefright amrnb: Properly negate all valuesMartin Storsjo2011-05-181-2/+2
| | * | stagefright amrnb: Fix a bug on architectures where long is 64 bitMartin Storsjo2011-05-181-1/+1
* | | | am bf45bbf3: Merge "stagefright aacenc: Zero-initialize a struct"Jean-Baptiste Queru2012-02-241-0/+2
|\ \ \ \ | |/ / /
| * | | Merge "stagefright aacenc: Zero-initialize a struct"Jean-Baptiste Queru2012-02-241-0/+2
| |\ \ \
| | * | | stagefright aacenc: Zero-initialize a structMartin Storsjo2012-01-131-0/+2
| | | |/ | | |/|
* | | | am e5bdd24b: Merge "stagefright aacenc: Avoid warnings about incompatible poi...Jean-Baptiste Queru2012-02-242-2/+2
|\ \ \ \ | |/ / /
| * | | Merge "stagefright aacenc: Avoid warnings about incompatible pointer types"Jean-Baptiste Queru2012-02-242-2/+2
| |\ \ \
| | * | | stagefright aacenc: Avoid warnings about incompatible pointer typesMartin Storsjo2012-01-302-2/+2
* | | | | am 47b56c5a: Merge "stagefright aacenc: Add const declarations to some pointers"Jean-Baptiste Queru2012-02-246-10/+11
|\ \ \ \ \ | |/ / / /
| * | | | Merge "stagefright aacenc: Add const declarations to some pointers"Jean-Baptiste Queru2012-02-246-10/+11
| |\ \ \ \
| | * | | | stagefright aacenc: Add const declarations to some pointersMartin Storsjo2012-01-186-10/+11
| | | |/ / | | |/| |
* | | | | am 1b704610: Merge "stagefright aacenc: Fix inline asm"Jean-Baptiste Queru2012-02-241-78/+61
|\ \ \ \ \ | |/ / / /
| * | | | Merge "stagefright aacenc: Fix inline asm"Jean-Baptiste Queru2012-02-241-78/+61
| |\ \ \ \
| | * | | | stagefright aacenc: Fix inline asmMans Rullgard2012-01-131-78/+61
* | | | | | am bf1e85bf: Merge "stagefright aacenc: Fix inline asm constraints"Jean-Baptiste Queru2012-02-241-15/+15
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "stagefright aacenc: Fix inline asm constraints"Jean-Baptiste Queru2012-02-241-15/+15
| |\ \ \ \ \ | | |/ / / / | | | | / / | | |_|/ / | |/| | |
| | * | | stagefright aacenc: Fix inline asm constraintsMans Rullgard2012-01-131-15/+15
| | |/ /
* | | | am 12045502: Merge "stagefright aacenc: Fix type definitions for 64 bit platf...Jean-Baptiste Queru2012-01-251-3/+3
|\ \ \ \ | |/ / /
| * | | Merge "stagefright aacenc: Fix type definitions for 64 bit platforms"Jean-Baptiste Queru2012-01-251-3/+3
| |\ \ \
| | * | | stagefright aacenc: Fix type definitions for 64 bit platformsMartin Storsjo2012-01-131-3/+3
| | |/ /
* | | | am 98539a4e: Merge "stagefright amrwbenc: Make the mem_malloc function 64-bit...Jean-Baptiste Queru2012-01-241-2/+7
|\ \ \ \ | |/ / /
| * | | Merge "stagefright amrwbenc: Make the mem_malloc function 64-bit safe"Jean-Baptiste Queru2012-01-241-2/+7
| |\ \ \
| | * | | stagefright amrwbenc: Make the mem_malloc function 64-bit safeMartin Storsjo2012-01-131-2/+7
| | |/ /
* | | | am d80cbb8c: Merge "stagefright aacenc: Add missing newlines at the end of fi...Jean-Baptiste Queru2012-01-2413-13/+13
|\ \ \ \ | |/ / /
| * | | Merge "stagefright aacenc: Add missing newlines at the end of files"Jean-Baptiste Queru2012-01-2413-13/+13
| |\ \ \
| | * | | stagefright aacenc: Add missing newlines at the end of filesMartin Storsjo2012-01-1313-13/+13
| | |/ /
* | | | am 164a9842: Merge "stagefright aacenc: Properly terminate a comment"Jean-Baptiste Queru2012-01-241-1/+1
|\ \ \ \ | |/ / /
| * | | Merge "stagefright aacenc: Properly terminate a comment"Jean-Baptiste Queru2012-01-241-1/+1
| |\ \ \
| | * | | stagefright aacenc: Properly terminate a commentMartin Storsjo2012-01-131-1/+1
| | |/ /
* | | | am 9d25b82d: Merge "Rename LOG_ASSERT to ALOG_ASSERT"Jean-Baptiste Queru2012-01-191-1/+1
|\ \ \ \ | |/ / /