summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* am 6a0fbc68: am a3c9d5c3: am 166776fb: Merge "Add missing includes."Elliott Hughes2015-01-293-0/+3
|\
| * am a3c9d5c3: am 166776fb: Merge "Add missing includes."Elliott Hughes2015-01-293-0/+3
| |\
| | * am 166776fb: Merge "Add missing includes."Elliott Hughes2015-01-293-0/+3
| | |\
| | | * Merge "Add missing includes."Elliott Hughes2015-01-293-0/+3
| | | |\
| | | | * Add missing includes.Elliott Hughes2015-01-283-0/+3
* | | | | am 2588b453: am 29e609a8: am 628d4ea1: Merge "stagefright: do not reject SPL5...Ronghua Wu2015-01-291-2/+2
|\ \ \ \ \ | |/ / / /
| * | | | am 29e609a8: am 628d4ea1: Merge "stagefright: do not reject SPL5 files outrig...Ronghua Wu2015-01-281-2/+2
| |\ \ \ \
| | * \ \ \ Merge "stagefright: do not reject SPL5 files outright in SoftMpeg4 decoder" i...Ronghua Wu2015-01-281-2/+2
| | |\ \ \ \
| | | * | | | stagefright: do not reject SPL5 files outright in SoftMpeg4 decoderRonghua Wu2015-01-281-2/+2
* | | | | | | am 0566949e: am ba553472: am aeccbffd: Merge "Avoid mixing declarations and s...Andreas Gampe2015-01-281-2/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am ba553472: am aeccbffd: Merge "Avoid mixing declarations and statements in ...Andreas Gampe2015-01-281-2/+1
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | am aeccbffd: Merge "Avoid mixing declarations and statements in C89 source fi...Andreas Gampe2015-01-281-2/+1
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | |
| | | * | | | Merge "Avoid mixing declarations and statements in C89 source files"Andreas Gampe2015-01-281-2/+1
| | | |\ \ \ \ | | | | |_|_|/ | | | |/| | |
| | | | * | | Avoid mixing declarations and statements in C89 source filesMartin Storsjo2014-12-301-2/+1
* | | | | | | am 5fcd4d19: am 0bd5274e: am 231406d5: NuPlayerRenderer: return current real ...Wei Jia2015-01-282-15/+18
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 0bd5274e: am 231406d5: NuPlayerRenderer: return current real time as rende...Wei Jia2015-01-282-15/+18
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | NuPlayerRenderer: return current real time as render time for video frame whe...Wei Jia2015-01-272-15/+18
| | | |_|_|/ | | |/| | |
* | | | | | am 88d74d20: Add missing AudioPolicy.cpp to Android.mkBrian Carlstrom2015-01-271-1/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Add missing AudioPolicy.cpp to Android.mkBrian Carlstrom2015-01-271-1/+2
* | | | | | resolved conflicts for merge of 9391844d to masterMarco Nelissen2015-01-2710-1662/+4
|\ \ \ \ \ \ | |/ / / / /
| * | | | | resolved conflicts for merge of b955b722 to lmp-mr1-dev-plus-aospMarco Nelissen2015-01-2710-1661/+4
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | am 47deb15e: Merge "Remove MediaPlayerService::decode()"Marco Nelissen2015-01-2710-1656/+13
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | Merge "Remove MediaPlayerService::decode()"Marco Nelissen2015-01-2710-1656/+13
| | | |\ \ \
| | | | * | | Remove MediaPlayerService::decode()Marco Nelissen2015-01-2610-1656/+13
* | | | | | | am b7909adc: am 64b08d23: am cbb803a5: Merge "Remove superfluous OpenSSL incl...Kenny Root2015-01-263-5/+4
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 64b08d23: am cbb803a5: Merge "Remove superfluous OpenSSL include paths."Kenny Root2015-01-263-5/+4
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | am cbb803a5: Merge "Remove superfluous OpenSSL include paths."Kenny Root2015-01-263-5/+4
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Remove superfluous OpenSSL include paths.Adam Langley2015-01-223-5/+4
| | | |/ / /
* | | | | | am d35c2120: am 1f7101ee: am 64c496c8: Merge "Fix MTP delete" into lmp-mr1-devMarco Nelissen2015-01-231-2/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 1f7101ee: am 64c496c8: Merge "Fix MTP delete" into lmp-mr1-devMarco Nelissen2015-01-231-2/+2
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | Merge "Fix MTP delete" into lmp-mr1-devMarco Nelissen2015-01-231-2/+2
| | |\ \ \ \
| | | * | | | Fix MTP deleteMarco Nelissen2015-01-231-2/+2
* | | | | | | am 882ffba6: am d8aff827: am ddc1216d: Merge "MPEG4Extractor: more NULL deref...Robert Shih2015-01-231-1/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am d8aff827: am ddc1216d: Merge "MPEG4Extractor: more NULL derefernce fixes i...Robert Shih2015-01-231-1/+1
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "MPEG4Extractor: more NULL derefernce fixes in parseChunk" into lmp-mr1...Robert Shih2015-01-231-1/+1
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | MPEG4Extractor: more NULL derefernce fixes in parseChunkRobert Shih2015-01-211-1/+1
* | | | | | | am 40a0ac3a: am 0fe24de8: am c0c2366c: Merge "stagefright: do not reject SPL4...Ronghua Wu2015-01-231-0/+4
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 0fe24de8: am c0c2366c: Merge "stagefright: do not reject SPL4 files outrig...Ronghua Wu2015-01-231-0/+4
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "stagefright: do not reject SPL4 files outright in SoftMpeg4 decoder" i...Ronghua Wu2015-01-231-0/+4
| | |\ \ \ \ \
| | | * | | | | stagefright: do not reject SPL4 files outright in SoftMpeg4 decoderRonghua Wu2015-01-221-0/+4
| | | |/ / / /
* | | | | | | am d9e8b820: am b3e1f71b: am 841d22b0: libstagefright: Use aligned width and ...Ronghua Wu2015-01-231-2/+4
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am b3e1f71b: am 841d22b0: libstagefright: Use aligned width and height.Ronghua Wu2015-01-231-2/+4
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | libstagefright: Use aligned width and height.Ronghua Wu2015-01-221-2/+4
| | |/ / / /
* | | | | | am 4beddcf5: am 9e308de9: am 4d4ea7f7: Merge "do not use paused postition if ...Chong Zhang2015-01-161-2/+8
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 9e308de9: am 4d4ea7f7: Merge "do not use paused postition if it\'s not ava...Chong Zhang2015-01-161-2/+8
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "do not use paused postition if it's not available" into lmp-mr1-devChong Zhang2015-01-161-2/+8
| | |\ \ \ \
| | | * | | | do not use paused postition if it's not availableChong Zhang2015-01-151-2/+8
| | * | | | | MidiFile: report correct state during transient period when start() is called...Wei Jia2015-01-141-1/+1
| * | | | | | am e680491e: am 1efe46de: Merge "Fix id3 parser crash"Marco Nelissen2015-01-151-2/+9
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | am 1efe46de: Merge "Fix id3 parser crash"Marco Nelissen2015-01-151-2/+9
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | |