summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* am 19bb6261: am bf826923: am faf38b24: am 9e3d9575: Merge "stagefright aacenc...Jean-Baptiste Queru2012-02-271-0/+6
|\
| * am 9e3d9575: Merge "stagefright aacenc: Add prototypes for arm specific imple...Jean-Baptiste Queru2012-02-271-0/+6
| |\
| | * Merge "stagefright aacenc: Add prototypes for arm specific implementations of...Jean-Baptiste Queru2012-02-271-0/+6
| | |\
| | | * stagefright aacenc: Add prototypes for arm specific implementations of functionsMartin Storsjo2012-02-241-0/+6
* | | | am 360db46e: am b7913f70: am 163777b8: am 354ac772: Merge "stagefright amrwb:...Jean-Baptiste Queru2012-02-273-13/+13
|\ \ \ \ | |/ / /
| * | | am 354ac772: Merge "stagefright amrwb: Make local const arrays static"Jean-Baptiste Queru2012-02-273-13/+13
| |\ \ \ | | |/ /
| | * | Merge "stagefright amrwb: Make local const arrays static"Jean-Baptiste Queru2012-02-273-13/+13
| | |\ \
| | | * | stagefright amrwb: Make local const arrays staticMartin Storsjo2012-02-243-13/+13
| | | |/
* | | | am 5ba910d8: am 040c5b2c: am ded8e681: am 695cfe1e: Merge "stagefright amrwb:...Jean-Baptiste Queru2012-02-271-1/+1
|\ \ \ \ | |/ / /
| * | | am 695cfe1e: Merge "stagefright amrwb: Change a C++ style cast into a C style...Jean-Baptiste Queru2012-02-271-1/+1
| |\ \ \ | | |/ /
| | * | Merge "stagefright amrwb: Change a C++ style cast into a C style cast"Jean-Baptiste Queru2012-02-271-1/+1
| | |\ \
| | | * | stagefright amrwb: Change a C++ style cast into a C style castMartin Storsjo2012-02-241-1/+1
| | | |/
* | | | am b205a5d8: am 50ee92e9: am d91b744d: am f7f1280e: Merge changes Ib4e27ea3,I...Jean-Baptiste Queru2012-02-2729-67/+93
|\ \ \ \ | |/ / /
| * | | am f7f1280e: Merge changes Ib4e27ea3,I4ad55266,Ie32b32c7Jean-Baptiste Queru2012-02-2729-67/+93
| |\ \ \ | | |/ /
| | * | Merge changes Ib4e27ea3,I4ad55266,Ie32b32c7Jean-Baptiste Queru2012-02-2729-67/+93
| | |\ \
| | | * | stagefright amrnb: Remove extern from table definitionsMartin Storsjo2012-02-2424-62/+73
| | | * | stagefright amrnb: Add includes for prototype declarations of tablesMartin Storsjo2012-02-2415-0/+15
| | | * | stagefright amrnb: Add missing const qualifier to table declarations in headersMartin Storsjo2012-02-245-5/+5
| | | |/
* | | | am 18a64b74: am a887ff9a: am 4f74be57: am 1a864db7: Merge "stagefright aacenc...Jean-Baptiste Queru2012-02-271-3/+1
|\ \ \ \ | |/ / /
| * | | am 1a864db7: Merge "stagefright aacenc: Simplify the definition of __inline"Jean-Baptiste Queru2012-02-271-3/+1
| |\ \ \ | | |/ /
| | * | Merge "stagefright aacenc: Simplify the definition of __inline"Jean-Baptiste Queru2012-02-271-3/+1
| | |\ \
| | | * | stagefright aacenc: Simplify the definition of __inlineMartin Storsjo2012-01-131-3/+1
* | | | | am 6b4d7bad: am f7210cf5: am 7346d73c: am 77576ff4: Merge "stagefright amrwbe...Jean-Baptiste Queru2012-02-271-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | am 77576ff4: Merge "stagefright amrwbenc: Remove a useless check"Jean-Baptiste Queru2012-02-271-1/+1
| |\ \ \ \ | | |/ / /
| | * | | Merge "stagefright amrwbenc: Remove a useless check"Jean-Baptiste Queru2012-02-271-1/+1
| | |\ \ \
| | | * | | stagefright amrwbenc: Remove a useless checkMartin Storsjo2012-02-241-1/+1
| | | | |/ | | | |/|
* | | | | am 2bf76b98: am 3e61e413: am 32901b39: am be9a7055: Merge "stagefright aacenc...Jean-Baptiste Queru2012-02-271-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | 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 484fc74b: am 4bcdeb86: am 716a0517: am fe5f5d77: Merge "stagefright amrwb:...Jean-Baptiste Queru2012-02-271-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 eb483de5: am bf5c5e5b: am c1da1e1b: am 94ee1bf2: Merge "stagefright amrwbe...Jean-Baptiste Queru2012-02-271-2/+2
|\ \ \ \ \ | |/ / / /
| * | | | 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 5b299d2f: am 18643e70: am 6bc542e0: am 5aff259c: Merge "stagefright aacenc...Jean-Baptiste Queru2012-02-271-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | 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
| | | |/
* | | | fix libgui header locationMathias Agopian2012-02-2715-28/+9
* | | | remove dependency on android_native{s_priv|buffer}.hMathias Agopian2012-02-242-2/+2
* | | | Merge "Make sure we return input/output buffers to the codec not just while"Andreas Huber2012-02-241-2/+2
|\ \ \ \
| * | | | Make sure we return input/output buffers to the codec not just whileAndreas Huber2012-02-241-2/+2
* | | | | am ed7e1e83: am 47023027: am 26d9944e: am 6a300a54: Merge "stagefright aacenc...Jean-Baptiste Queru2012-02-242-2/+2
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | 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
| | | | |/ | | | |/|