diff options
| author | Robert Shih <robertshih@google.com> | 2015-01-05 17:35:54 -0800 |
|---|---|---|
| committer | Zach Riggle <riggle@google.com> | 2015-02-25 17:31:57 +0000 |
| commit | fe03f73d86bb415f5d5145f0de091834d89ae3a9 (patch) | |
| tree | fa607172a51170011043a907c3a475da4c60c24a /include/FLAC/all.h | |
| parent | e4ad9757d5c98dea026da1697466293ac96268be (diff) | |
| download | android_external_flac-fe03f73d86bb415f5d5145f0de091834d89ae3a9.tar.gz android_external_flac-fe03f73d86bb415f5d5145f0de091834d89ae3a9.tar.bz2 android_external_flac-fe03f73d86bb415f5d5145f0de091834d89ae3a9.zip | |
libFLAC: merge master from Xiph
remote: https://git.xiph.org/flac.git
commit: 775eb93
Bug: 18872897
Bug: 18910747
Change-Id: I6e450e44c96b97c3323e428b9e6d420422f24a4e
(cherry picked from commit 31e4f3166a91a2ebb34f643787122a638d9f1471)
Diffstat (limited to 'include/FLAC/all.h')
| -rw-r--r-- | include/FLAC/all.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/include/FLAC/all.h b/include/FLAC/all.h index c542c0d..6f4d336 100644 --- a/include/FLAC/all.h +++ b/include/FLAC/all.h @@ -1,5 +1,6 @@ /* libFLAC - Free Lossless Audio Codec library - * Copyright (C) 2000,2001,2002,2003,2004,2005,2006,2007 Josh Coalson + * Copyright (C) 2000-2009 Josh Coalson + * Copyright (C) 2011-2014 Xiph.Org Foundation * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -161,7 +162,7 @@ * in FLAC 1.1.3 is a set of \c #defines in \c export.h of each * library's includes (e.g. \c include/FLAC/export.h). The * \c #defines mirror the libraries' - * <A HREF="http://www.gnu.org/software/libtool/manual.html#Libtool-versioning">libtool version numbers</A>, + * <A HREF="http://www.gnu.org/software/libtool/manual/libtool.html#Libtool-versioning">libtool version numbers</A>, * e.g. in libFLAC there are \c FLAC_API_VERSION_CURRENT, * \c FLAC_API_VERSION_REVISION, and \c FLAC_API_VERSION_AGE. * These can be used to support multiple versions of an API during the @@ -175,7 +176,7 @@ * #endif * \endcode * - * The the source will work for multiple versions and the legacy code can + * The source will work for multiple versions and the legacy code can * easily be removed when the transition is complete. * * Another available symbol is FLAC_API_SUPPORTS_OGG_FLAC (defined in |