summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* Merge "NuPlayerRenderer: Do not deliver audio too soon after stop" into mnc-d...Andy Hung2015-09-142-1/+19
|\
| * NuPlayerRenderer: Do not deliver audio too soon after stopAndy Hung2015-09-012-1/+19
* | am 4374b187: Merge "NuCachedSource2: fix possible erroneous early free" into ...Wonsik Kim2015-09-144-7/+21
|\ \
| * \ Merge "NuCachedSource2: fix possible erroneous early free" into mnc-devWonsik Kim2015-09-144-7/+21
| |\ \
| | * | NuCachedSource2: fix possible erroneous early freeWonsik Kim2015-09-094-7/+21
* | | | am 393eb647: Merge "Avoid size_t overflow in base64 decoding once again" into...Wonsik Kim2015-09-112-93/+20
|\ \ \ \ | |/ / /
| * | | Merge "Avoid size_t overflow in base64 decoding once again" into mnc-devWonsik Kim2015-09-112-93/+20
| |\ \ \
| | * | | Avoid size_t overflow in base64 decoding once againWonsik Kim2015-09-072-93/+20
| | |/ /
* | | | Merge "libstagefright: Do not add audio codecs to resource manager. They are ...Ronghua Wu2015-09-111-2/+5
|\ \ \ \
| * | | | libstagefright: Do not add audio codecs to resource manager. They are too sma...Ronghua Wu2015-09-101-2/+5
| | |_|/ | |/| |
* | | | am 7a2ffb90: Merge "IAudioFlinger: clear config before reading it from parcel...Wei Jia2015-09-102-15/+29
|\ \ \ \ | | |/ / | |/| |
| * | | Merge "IAudioFlinger: clear config before reading it from parcel." into mnc-devWei Jia2015-09-102-15/+29
| |\ \ \
| | * | | IAudioFlinger: clear config before reading it from parcel.Wei Jia2015-09-092-15/+29
| | | |/ | | |/|
* | | | am b946648c: Protect data source access with mutex during disconnectRobert Shih2015-09-092-8/+24
|\ \ \ \ | |/ / /
| * | | Protect data source access with mutex during disconnectRobert Shih2015-09-082-8/+24
* | | | am c336136d: Merge "libstagefright: fix A_Refl to return immediately when the...Wei Jia2015-09-082-2/+5
|\ \ \ \ | |/ / /
| * | | Merge "libstagefright: fix A_Refl to return immediately when there is an erro...Wei Jia2015-09-082-2/+5
| |\ \ \ | | |/ / | |/| |
| | * | libstagefright: fix A_Refl to return immediately when there is an error.Wei Jia2015-09-042-2/+5
* | | | am 35e03636: am becceb11: am b57ffbb5: am d021f7e5: am b18c0276: am 2b63b91b:...Robert Shih2015-09-042-3/+3
|\ \ \ \ | |/ / /
| * | | am becceb11: am b57ffbb5: am d021f7e5: am b18c0276: am 2b63b91b: am c1e989e7:...Robert Shih2015-09-042-3/+3
| |\ \ \
| | * \ \ am b57ffbb5: am d021f7e5: am b18c0276: am 2b63b91b: am c1e989e7: am 13ff64c2:...Robert Shih2015-09-042-3/+3
| | |\ \ \
| | | * \ \ am b18c0276: am 2b63b91b: am c1e989e7: am 13ff64c2: Merge "Zero out return va...Robert Shih2015-09-042-3/+3
| | | |\ \ \
| | | | * \ \ am 2b63b91b: am c1e989e7: am 13ff64c2: Merge "Zero out return values in media...Robert Shih2015-09-042-3/+3
| | | | |\ \ \
| | | | | * \ \ am c1e989e7: am 13ff64c2: Merge "Zero out return values in media binder calls...Robert Shih2015-09-032-3/+3
| | | | | |\ \ \
| | | | | | * \ \ am 13ff64c2: Merge "Zero out return values in media binder calls" into klp-devRobert Shih2015-09-032-3/+3
| | | | | | |\ \ \
| | | | | | | * \ \ Merge "Zero out return values in media binder calls" into klp-devRobert Shih2015-09-032-3/+3
| | | | | | | |\ \ \
| | | | | | | | * | | Zero out return values in media binder callsRobert Shih2015-09-022-3/+3
* | | | | | | | | | | am 7ecf6369: am 7734e37e: am a1179678: am be695f0a: am 5e193041: am 52a4fc09:...Andy Hung2015-09-041-7/+20
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | am 7734e37e: am a1179678: am be695f0a: am 5e193041: am 52a4fc09: am 3732a3ac:...Andy Hung2015-09-041-7/+20
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | am a1179678: am be695f0a: am 5e193041: am 52a4fc09: am 3732a3ac: am ab203130:...Andy Hung2015-09-041-7/+20
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / /
| | | * | | | | | | | am 5e193041: am 52a4fc09: am 3732a3ac: am ab203130: Merge "Make IEffect comma...Andy Hung2015-09-041-7/+20
| | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / /
| | | | * | | | | | | am 52a4fc09: am 3732a3ac: am ab203130: Merge "Make IEffect command more robus...Andy Hung2015-09-041-7/+20
| | | | |\ \ \ \ \ \ \ | | | | | |/ / / / / /
| | | | | * | | | | | am 3732a3ac: am ab203130: Merge "Make IEffect command more robust (second try...Andy Hung2015-09-031-7/+20
| | | | | |\ \ \ \ \ \ | | | | | | |/ / / / /
| | | | | | * | | | | am ab203130: Merge "Make IEffect command more robust (second try)" into klp-devAndy Hung2015-09-031-7/+20
| | | | | | |\ \ \ \ \ | | | | | | | |/ / / /
| | | | | | | * | | | Merge "Make IEffect command more robust (second try)" into klp-devAndy Hung2015-09-031-7/+20
| | | | | | | |\ \ \ \
| | | | | | | | * | | | Make IEffect command more robust (second try)Andy Hung2015-09-021-7/+20
| | | | | | | | |/ / /
* | | | | | | | | | | am 3af22d1f: am a6e476cb: am 2cec2b4c: am 9bbc490e: am facd279e: am 7d34959b:...Marco Nelissen2015-09-042-254/+377
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | am a6e476cb: am 2cec2b4c: am 9bbc490e: am facd279e: am 7d34959b: am 16e12007:...Marco Nelissen2015-09-042-254/+377
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | | / / | | |_|_|_|_|_|_|/ / | |/| | | | | | | |
| | * | | | | | | | am 2cec2b4c: am 9bbc490e: am facd279e: am 7d34959b: am 16e12007: am 74888428:...Marco Nelissen2015-09-042-254/+377
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / /
| | | * | | | | | | am facd279e: am 7d34959b: am 16e12007: am 74888428: Merge "Fix timedtext pars...Marco Nelissen2015-09-042-254/+377
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / /
| | | | * | | | | | am 7d34959b: am 16e12007: am 74888428: Merge "Fix timedtext parsing" into klp...Marco Nelissen2015-09-042-254/+377
| | | | |\ \ \ \ \ \ | | | | | |/ / / / /
| | | | | * | | | | am 16e12007: am 74888428: Merge "Fix timedtext parsing" into klp-devMarco Nelissen2015-09-032-254/+377
| | | | | |\ \ \ \ \ | | | | | | |/ / / /
| | | | | | * | | | am 74888428: Merge "Fix timedtext parsing" into klp-devMarco Nelissen2015-09-032-254/+377
| | | | | | |\ \ \ \ | | | | | | | |/ / /
| | | | | | | * | | Merge "Fix timedtext parsing" into klp-devMarco Nelissen2015-09-032-254/+377
| | | | | | | |\ \ \
| | | | | | | | * | | Fix timedtext parsingMarco Nelissen2015-08-312-254/+377
| | | | | | | | |/ /
| | | | | | * | | | am 9d916c77: DO NOT MERGE - libstagefright: sanity check size before derefere...Wei Jia2015-09-031-5/+16
| | | | | | |\ \ \ \ | | | | | | | |/ / /
| | | | | | | * | | DO NOT MERGE - libstagefright: sanity check size before dereferencing pointer...Wei Jia2015-09-031-5/+16
| | * | | | | | | | resolved conflicts for 3b8747ca to lmp-mr1-ub-devWei Jia2015-09-041-8/+28
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / /
| | | * | | | | | | am 7ea22fce: am c6a2815e: DO NOT MERGE - libstagefright: sanity check size be...Wei Jia2015-09-041-8/+28
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / /
| | | | * | | | | | am c6a2815e: DO NOT MERGE - libstagefright: sanity check size before derefere...Wei Jia2015-09-041-8/+28
| | | | |\ \ \ \ \ \ | | | | | |/ / / / /