Skip to content

Commit

Permalink
Merge branch 'master' of github.com:asantoni/libaudiodecoder
Browse files Browse the repository at this point in the history
  • Loading branch information
asantoni committed Apr 14, 2012
2 parents 5fc3e13 + db816ca commit 2ed87ee
Showing 1 changed file with 36 additions and 1 deletion.
37 changes: 36 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ Compatibility
</tr>
</table>
* Requires Windows 7+ or greater
\* Requires Windows 7+ or greater
If you require support for all the different types of WAVE files (different encodings, bit depths, etc.), check out [libsndfile](http://www.mega-nerd.com/libsndfile/). It should also be noted that DRM encrypted files are not supported on any platform.
Expand All @@ -115,3 +115,38 @@ Authors
libaudiodecoder was originally created by [RJ Ryan](http://rustyryan.net/), [Bill Good](https://github.com/bkgood), and [Albert Santoni](http://www.santoni.ca/albert) from code we wrote for [Mixxx](http://www.mixxx.org/ "Mixxx"). We later refactored the code and rolled it into a separate library for use in [BeatCleaver](http://www.oscillicious.com/beatcleaver/ "BeatCleaver") by [Oscillicious](http://www.oscillicious.com/ "Oscillicious"). By sharing this code, we hope other developers will benefit from it in the same way open source has helped us.
License (MIT)
=============
Copyright (c) 2010-2012 Albert Santoni, Bill Good, RJ Ryan
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files
(the "Software"), to deal in the Software without restriction,
including without limitation the rights to use, copy, modify, merge,
publish, distribute, sublicense, and/or sell copies of the Software,
and to permit persons to whom the Software is furnished to do so,
subject to the following conditions:
The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
The text above constitutes the entire libaudiodecoder license; however,
the Oscillicious community also makes the following non-binding requests:
Any person wishing to distribute modifications to the Software is
requested to send the modifications to the original developer so that
they can be incorporated into the canonical version. It is also
requested that these non-binding requests be included along with the
license above.

0 comments on commit 2ed87ee

Please sign in to comment.