summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix NULL pointer dereferencestable/cm-12.1-YOG7DMarco Nelissen2016-09-121-2/+4
* Merge tag 'android-5.1.1_r37' into HEADJessica Wagantall2016-04-052-0/+41
|\
| * Sonivox: add SafetyNet log.Wei Jia2016-02-262-0/+9
| * Sonivox: sanity check numSamples.Wei Jia2016-02-262-0/+32
| * Sonivox: check loopStart/loopLength against one specific wave, not whole wave...Wei Jia2015-09-011-6/+17
| * Sonivox: fix overflow in Parse_data in eas_mdls.cWei Jia2015-09-011-0/+24
| * Sonivox: make sure waveIndex is valid in Parse_rgn() in eas_mdls.c.Wei Jia2015-09-011-0/+4
| * Check segments and libsMarco Nelissen2015-09-011-0/+6
| * DLS parser: fix wave pool size check.Eric Laurent2015-07-091-1/+1
* | Sonivox: check loopStart/loopLength against one specific wave, not whole wave...Wei Jia2015-10-051-6/+17
* | Sonivox: fix overflow in Parse_data in eas_mdls.cWei Jia2015-10-051-0/+24
* | Sonivox: make sure waveIndex is valid in Parse_rgn() in eas_mdls.c.Wei Jia2015-10-051-0/+4
* | Check segments and libsMarco Nelissen2015-10-051-0/+6
* | Merge tag 'android-5.1.1_r13' into cm-12.1Ricardo Cerqueira2015-09-090-0/+0
|\ \
| * | DLS parser: fix wave pool size check.Eric Laurent2015-07-271-1/+1
| |/
* | DLS parser: fix wave pool size check.Eric Laurent2015-08-121-1/+1
* | audio : midi decoder lib state is not updated on midiplayer stopstaging/cm-12.1staging/cm-12.0-cafstable/cm-12.1-YOG3Cstable/cm-12.0-YNG3Cstable/cm-12.0-YNG1TAstable/cm-12.0-YNG1Tstable/cm-12.0-YNG1IDivya Narayanan Poojary2014-11-041-4/+4
* | audio: Support for mxmf file playbackAmit Shekhar2014-11-041-2/+8
|/
* Merge "Remove unused LOCAL_LDLIBS."Ying Wang2014-05-071-2/+0
|\
| * Remove unused LOCAL_LDLIBS.Ying Wang2014-05-071-2/+0
|/
* remove include of utils/Log.hColin Cross2013-07-241-2/+1
* am 4a213147: am 274d0571: Merge "Added support for parsing XMF versions 1.00 ...Jean-Baptiste Queru2012-09-061-17/+28
|\
| * am 274d0571: Merge "Added support for parsing XMF versions 1.00 and 1.01 head...cm-10.1.3-RC2cm-10.1.3-RC1cm-10.1.3cm-10.1.2cm-10.1.1cm-10.1.0-RC5cm-10.1.0-RC4cm-10.1.0-RC3cm-10.1.0-RC2cm-10.1.0-RC1cm-10.1.0cm-10.1-M3cm-10.1-M2cm-10.1-M1mr1.1-stagingcm-10.1Jean-Baptiste Queru2012-09-061-17/+28
| |\
| | * Merge "Added support for parsing XMF versions 1.00 and 1.01 headers"Jean-Baptiste Queru2012-09-061-17/+28
| | |\
| | | * Added support for parsing XMF versions 1.00 and 1.01 headersAndreas Lillvik2012-09-061-17/+28
| | |/
* | | am 0eb1fab7: am 09a0c670: Merge "There is fd leak in sonivox lib when try ope...Jean-Baptiste Queru2012-08-151-1/+12
|\ \ \ | |/ /
| * | am 09a0c670: Merge "There is fd leak in sonivox lib when try open any media f...Jean-Baptiste Queru2012-08-151-1/+12
| |\ \ | | |/
| | * Merge "There is fd leak in sonivox lib when try open any media file > 2GB (MI...Jean-Baptiste Queru2012-08-151-1/+12
| | |\
| | | * There is fd leak in sonivox lib when try open any media filegbhakteX2012-08-141-1/+12
| | |/
* | | Split out LOCAL_ASFLAGSYing Wang2012-08-101-2/+5
|/ /
* | Remove obsolete ThirdPartyProject.prop file.Elliott Hughes2012-05-151-9/+0
|/
* Fix crash when scanning corrupt midi file.jellybean-stablejellybeanMarco Nelissen2011-12-161-0/+5
* am d868ec62: Reconcile gingerbread-plus-aosp and honeycombThe Android Open Source Project2011-01-300-0/+0
|\
| * Reconcile gingerbread-plus-aosp and honeycombThe Android Open Source Project2011-01-300-0/+0
| |\
| | * Mass merge from gingerbread - do not mergeThe Android Open Source Project2011-01-300-0/+0
| | |\
| | | * am d029b237: Remove unused file.Dan Bornstein2011-01-290-0/+0
| | | |\ | | |/ /
* | | | am fbbe5ab5: am 42196fd1: am cdffe35c: merge from gingerbreadThe Android Open Source Project2011-01-240-0/+0
|\ \ \ \ | |/ / /
| * | | am 42196fd1: am cdffe35c: merge from gingerbreadThe Android Open Source Project2011-01-240-0/+0
| |\ \ \
| | * \ \ am cdffe35c: merge from gingerbreadThe Android Open Source Project2011-01-210-0/+0
| | |\ \ \
| | | * \ \ merge from gingerbreadThe Android Open Source Project2011-01-211-0/+0
| | | |\ \ \ | | | | | |/ | | | | |/|
* | | | | | am 7eaac433: am d2c550cd: am d029b237: Remove unused file.Dan Bornstein2011-01-240-0/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am d2c550cd: am d029b237: Remove unused file.Dan Bornstein2011-01-240-0/+0
| |\ \ \ \ \ | | |/ / / / | | | | | / | | |_|_|/ | |/| | |
| | * | | am d029b237: Remove unused file.Dan Bornstein2011-01-211-0/+0
| | |\ \ \ | | | |/ / | | |/| / | | | |/
| | | * Remove unused file.cm-7.1.0gingerbread-releasegingerbreadgb-release-7.2Dan Bornstein2011-01-211-0/+0
* | | | am bc636d8f: (-s ours) Remove unused file. DO NOT MERGE.Dan Bornstein2011-01-210-0/+0
|\ \ \ \ | |/ / /
| * | | Remove unused file. DO NOT MERGE.Dan Bornstein2011-01-211-0/+0
|/ / /
* | | Fix engine state reporting.Marco Nelissen2010-12-221-2/+2
* | | Add missing NOTICE files.David Deephanphongs2010-10-191-0/+14
|/ /
* | am 91f74c00: add meta-files about 3rd party projectsThe Android Open Source Project2010-07-161-0/+9
|\ \ | |/
| * add meta-files about 3rd party projectsThe Android Open Source Project2010-07-161-0/+9