summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ \ \
| * | | | Remove check for an impossible conditionBernhard Rosenkraenzer2014-10-041-4/+0
* | | | | Merge "C++11 compatibility."Dan Albert2014-11-201-4/+4
|\ \ \ \ \
| * | | | | C++11 compatibility.Dan Albert2014-11-201-4/+4
| | |/ / / | |/| | |
* | | | | Remove extraneous parenthesesBernhard Rosenkränzer2014-11-201-1/+1
|/ / / /
* | | | Merge "Use standard syntax to initialize fields."Glenn Kasten2014-11-191-712/+712
|\ \ \ \
| * | | | Use standard syntax to initialize fields.Chih-Hung Hsieh2014-11-141-712/+712
* | | | | Merge "Remove extraneous parentheses"Chih-hung Hsieh2014-11-182-2/+2
|\ \ \ \ \
| * | | | | Remove extraneous parenthesesBernhard Rosenkränzer2014-11-182-2/+2
| | |_|/ / | |/| | |
* | | | | Fix uninitialized variableBernhard Rosenkränzer2014-11-181-1/+1
|/ / / /
* | | | No need to #include atomic-inline.h if you have atomic.h.Elliott Hughes2014-11-171-1/+0
* | | | Merge "Fix struct vs. class mismatches"Chih-hung Hsieh2014-11-1711-13/+12
|\ \ \ \
| * | | | Fix struct vs. class mismatchesBernhard Rosenkränzer2014-11-1711-13/+12
* | | | | libcutils no longer requires that its users configure ANDROID_SMP.Elliott Hughes2014-11-171-2/+0
|/ / / /
* | | | Update calls to IInterface::asBinder()Marco Nelissen2014-11-1727-77/+76
* | | | Move libldnhncr to libc++.Dan Albert2014-11-151-1/+0
|/ / /
* | | libstagefright: use __predict_false from bionic rather than CONDITION from lo...Mark Salyzyn2014-11-111-1/+1
| |/ |/|
* | Remove the executable bit from source filesMartin Storsjo2014-11-0791-0/+0
* | Resolve conflictThe Android Open Source Project2014-11-06358-10568/+34032
|\ \
| * \ am 686a0c4d: Merge "MTP Device: Parse USB3 descriptor for MTP initor;"Mike Lockwood2014-10-291-0/+9
| |\ \
| * \ \ am d5923409: mediaplayer: limit scheduling video frames into the futureLajos Molnar2014-10-212-1/+43
| |\ \ \
| | * | | mediaplayer: limit scheduling video frames into the futureLajos Molnar2014-10-202-1/+43
| * | | | am eecb7805: NuPlayer: set anchor time for each audio buffer.Ronghua Wu2014-10-212-36/+48
| |\ \ \ \ | | |/ / /
| | * | | NuPlayer: set anchor time for each audio buffer.Ronghua Wu2014-10-202-36/+48