summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* Add missing includes.Elliott Hughes2015-01-283-0/+3
* Merge "Remove MediaPlayerService::decode()"Marco Nelissen2015-01-2710-1656/+13
|\
| * Remove MediaPlayerService::decode()Marco Nelissen2015-01-2610-1656/+13
* | Remove superfluous OpenSSL include paths.Adam Langley2015-01-223-5/+4
|/
* Fix id3 parser crashMarco Nelissen2015-01-151-2/+9
* 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
* | 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
* | Use callbacks for Midi I/OMarco Nelissen2015-01-087-61/+99
* | Remove hardcoded ICU & OpenSSL include paths.Narayan Kamath2015-01-052-5/+0
|/
* 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
* | Fix wrong int argument of FOURCC.Chih-Hung Hsieh2014-12-161-4/+4
* | Remove obsolete TARGET_SIMULATOR checksTrevor Drake2014-12-111-24/+11
* | Fix AAC recording issueMarco Nelissen2014-12-101-1/+2
* | Merge "Truncate file before recording into it."Marco Nelissen2014-12-101-0/+3
|\ \
| * | Truncate file before recording into it.Marco Nelissen2014-12-101-0/+3
* | | Fix print format mismatches.Chih-Hung Hsieh2014-12-092-3/+3
* | | Merge "Fix build with clang in C++11 mode"Lajos Molnar2014-12-0937-98/+98
|\ \ \
| * | | Fix build with clang in C++11 modeBernhard Rosenkränzer2014-11-2737-98/+98
* | | | Merge "Cast int64_t values to long long before print."Lajos Molnar2014-12-091-2/+2
|\ \ \ \
| * | | | Cast int64_t values to long long before print.Bernhard Rosenkränzer2014-12-041-2/+2
* | | | | Merge "Fix build with clang"Lajos Molnar2014-12-091-2/+1
|\ \ \ \ \
| * | | | | Fix build with clangBernhard Rosenkränzer2014-12-081-2/+1
| |/ / / /
* | | | | Merge "Prevent ANR when AudioTrack is paused or re-routed"Glenn Kasten2014-12-091-0/+2
|\ \ \ \ \
| * | | | | Prevent ANR when AudioTrack is paused or re-routedzunkyu.lee2014-12-081-0/+2
| | |/ / / | |/| | |
* | | | | Stagefright: Fix unused variablesAndreas Gampe2014-12-042-4/+1
| |/ / / |/| | |
* | | | Merge "libstagefright: defer kWhatSetParameters in OutputPortSettingsChangedS...Lajos Molnar2014-12-041-0/+1
|\ \ \ \
| * | | | libstagefright: defer kWhatSetParameters in OutputPortSettingsChangedStatePer Persson2014-12-041-0/+1
* | | | | Merge "Track volume should be maintained even if track is restored"Glenn Kasten2014-12-021-1/+5
|\ \ \ \ \
| * | | | | Track volume should be maintained even if track is restoredseunghak.han2014-12-011-1/+5
| | |/ / / | |/| | |
* | | | | Merge "Added support for YEAR metadata key from VorbisComments"Glenn Kasten2014-12-011-0/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Added support for YEAR metadata key from VorbisCommentsAndreas Lillvik2014-11-111-0/+1
| |/ / /
* | | | Merge "Stagefright: Fix unused variables, functions, values"Andreas Gampe2014-11-2643-241/+95
|\ \ \ \
| * | | | Stagefright: Fix unused variables, functions, valuesAndreas Gampe2014-11-2543-241/+95
* | | | | Merge "Fix overload of SoftVideoDecoderOMXComponent::updatePortDefinitions"Chih-hung Hsieh2014-11-252-3/+3
|\ \ \ \ \
| * | | | | Fix overload of SoftVideoDecoderOMXComponent::updatePortDefinitionsBernhard Rosenkränzer2014-11-202-3/+3
* | | | | | Remove deprecated register keywordBernhard Rosenkränzer2014-11-251-1/+1
* | | | | | Merge "Img_utils: Fix "unused" variables"Andreas Gampe2014-11-252-2/+2
|\ \ \ \ \ \
| * | | | | | Img_utils: Fix "unused" variablesAndreas Gampe2014-11-242-2/+2
| | |/ / / / | |/| | | |
* | | | | | Libcpustats: Remove unused variableAndreas Gampe2014-11-251-1/+0
* | | | | | Merge "Remove unused parameter"chh2014-11-251-1/+1
|\ \ \ \ \ \
| * | | | | | Remove unused parameterBernhard Rosenkränzer2014-11-181-1/+1
* | | | | | | Merge "Remove bogus forward declarations"Chih-hung Hsieh2014-11-242-4/+0
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Remove bogus forward declarationsBernhard Rosenkränzer2014-11-202-4/+0
| | |/ / / / | |/| | | |
* | | | | | Stagefright: Fix default typoAndreas Gampe2014-11-241-2/+2
* | | | | | Merge "Remove check for an impossible condition"Chih-hung Hsieh2014-11-241-4/+0
|\ \ \ \ \ \