summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* am cec272df: am 724b9ea5: Merge "Replace MidiFile player with a Midi extractor"Marco Nelissen2015-01-1316-940/+441
|\
| * am 724b9ea5: Merge "Replace MidiFile player with a Midi extractor"Marco Nelissen2015-01-1316-940/+441
| |\
| | * Merge "Replace MidiFile player with a Midi extractor"Marco Nelissen2015-01-1316-940/+441
| | |\
| | | * Replace MidiFile player with a Midi extractorMarco Nelissen2015-01-0816-940/+441
| * | | am a2d2c48a: Merge "Don\'t signal an error at the end of a short file"Marco Nelissen2015-01-091-19/+11
| |\ \ \ | | |/ /
| | * | Merge "Don't signal an error at the end of a short file"Marco Nelissen2015-01-091-19/+11
| | |\ \ | | | |/ | | |/|
| | | * Don't signal an error at the end of a short fileMarco Nelissen2014-12-231-19/+11
* | | | am 26c73acb: am 0b460ad7: Merge "ACodec: Added support for E-AC3 decoders" in...Rachad2015-01-102-0/+68
|\ \ \ \
| * \ \ \ Merge "ACodec: Added support for E-AC3 decoders" into lmp-mr1-devRachad2015-01-102-0/+68
| |\ \ \ \
| | * | | | ACodec: Added support for E-AC3 decodersRachad2014-12-232-0/+68
* | | | | | am d8ba6ef1: am 38a97bd7: stagefright: keep alignment restrictions for SoftVi...Lajos Molnar2015-01-101-21/+14
|\ \ \ \ \ \ | |/ / / / /
| * | | | | stagefright: keep alignment restrictions for SoftVideoDecoderLajos Molnar2015-01-091-21/+14
* | | | | | am d18196a1: am c8c68c88: Merge "Use aligned width and height to compute size...Ronghua Wu2015-01-081-3/+6
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Use aligned width and height to compute size." into lmp-mr1-devRonghua Wu2015-01-081-3/+6
| |\ \ \ \ \
| | * | | | | Use aligned width and height to compute size.Ronghua Wu2015-01-071-3/+6
| | |/ / / /
* | | | | | resolved conflicts for merge of 2702d5a0 to lmp-mr1-dev-plus-aospMarco Nelissen2015-01-087-61/+97
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | am c52af00b: Merge "Use callbacks for Midi I/O"Marco Nelissen2015-01-087-61/+99
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | Use callbacks for Midi I/OMarco Nelissen2015-01-087-61/+99
* | | | | | am e0344754: am 468977f0: Merge "mark any copyrighted content as protected to...Chong Zhang2015-01-084-1/+18
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge "mark any copyrighted content as protected to disable capture" into lmp...Chong Zhang2015-01-084-1/+18
| |\ \ \ \ \
| | * | | | | mark any copyrighted content as protected to disable captureChong Zhang2015-01-074-1/+18
| | | |_|/ / | | |/| | |
* | | | | | am 9fc2f470: am 8140a2b7: stagefright: report crop rectangle as codec resolut...Lajos Molnar2015-01-071-5/+7
|\ \ \ \ \ \ | |/ / / / /
| * | | | | stagefright: report crop rectangle as codec resolution if existsLajos Molnar2015-01-061-5/+7
* | | | | | am fb5d35c0: am 7ae3dfab: Merge "fix record from default input source" into l...Eric Laurent2015-01-071-4/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | fix record from default input sourceEric Laurent2015-01-061-4/+0
| |/ / / /
* | | | | am bef17542: am 5c97c4e1: Merge "Remove hardcoded ICU & OpenSSL include paths."Narayan Kamath2015-01-052-5/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | am 5c97c4e1: Merge "Remove hardcoded ICU & OpenSSL include paths."Narayan Kamath2015-01-052-5/+0
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Remove hardcoded ICU & OpenSSL include paths.Narayan Kamath2015-01-052-5/+0
| | | |/ | | |/|
* | | | am 69bdf92f: am 0d19abb4: Merge "NuPlayer: Do not recreate AudioTrack if not ...Andy Hung2014-12-292-0/+39
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge "NuPlayer: Do not recreate AudioTrack if not needed" into lmp-mr1-devAndy Hung2014-12-232-0/+39
| |\ \ \
| | * | | NuPlayer: Do not recreate AudioTrack if not neededAndy Hung2014-12-192-0/+39
* | | | | resolved conflicts for merge of 2efb9566 to lmp-mr1-dev-plus-aospNarayan Kamath2014-12-297-14/+71
|\ \ \ \ \ | |/ / / /
| * | | | HLS: QCom enhancementsRobert Shih2014-12-227-14/+71
* | | | | am 0b87c0d9: am bd08223c: Merge "Fix double close."Marco Nelissen2014-12-222-1/+1
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | am bd08223c: Merge "Fix double close."Marco Nelissen2014-12-222-1/+1
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Merge "Fix double close."Marco Nelissen2014-12-222-1/+1
| | |\ \ \
| | | * | | Fix double close.Bao Haojun2014-05-172-1/+1
| | * | | | DO NOT MERGE - NuPlayer: open audio sink in offload mode when resuming from t...Ronghua Wu2014-12-183-5/+36
| | * | | | DO NOT MERGE - NuPlayer: invalid anchor time when render is flushed.Ronghua Wu2014-12-182-0/+8
| |/ / / /
* | | | | am 4af263bd: am ad019236: Merge "NuPlayer: reports paused position in paused ...Wei Jia2014-12-193-7/+67
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge "NuPlayer: reports paused position in paused state." into lmp-mr1-devWei Jia2014-12-193-7/+67
| |\ \ \ \
| | * | | | NuPlayer: reports paused position in paused state.Wei Jia2014-12-193-7/+67
| | | |_|/ | | |/| |
* | | | | am 823ee706: am d4b056da: Merge "NuPlayer: Fix failure to stop audio playback...Andy Hung2014-12-191-4/+7
|\ \ \ \ \ | |/ / / /
| * | | | Merge "NuPlayer: Fix failure to stop audio playback" into lmp-mr1-devAndy Hung2014-12-191-4/+7
| |\ \ \ \
| | * | | | NuPlayer: Fix failure to stop audio playbackAndy Hung2014-12-181-4/+7
| | |/ / /
* | | | | am c9330d9a: am 89ee55cb: Merge "OggExtractor: ignore timestamp calculation f...Robert Shih2014-12-191-10/+8
|\ \ \ \ \ | |/ / / /
| * | | | Merge "OggExtractor: ignore timestamp calculation for configuration packets" ...Robert Shih2014-12-191-10/+8
| |\ \ \ \
| | * | | | OggExtractor: ignore timestamp calculation for configuration packetsRobert Shih2014-12-181-10/+8
| | |/ / /
* | | | | am 9dcc312a: am 1391f933: MPEG4Extractor: null check in MPEG4Source::parseChunkRobert Shih2014-12-191-0/+3
|\ \ \ \ \ | |/ / / /
| * | | | MPEG4Extractor: null check in MPEG4Source::parseChunkRobert Shih2014-12-171-0/+3
| |/ / /
generated by cgit v1.1 at 2024-05-30 08:32:51 +0000