diff options
author | Robert Shih <robertshih@google.com> | 2015-01-05 17:35:54 -0800 |
---|---|---|
committer | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2015-10-18 22:49:31 +0200 |
commit | f18d1a93390fedbb03f81db82322215ce027c1e0 (patch) | |
tree | fa607172a51170011043a907c3a475da4c60c24a /libFLAC/include/protected/all.h | |
parent | 686d6ff2afda2ea3211bec37ad0daa655c24e6d4 (diff) | |
download | external_flac-f18d1a93390fedbb03f81db82322215ce027c1e0.zip external_flac-f18d1a93390fedbb03f81db82322215ce027c1e0.tar.gz external_flac-f18d1a93390fedbb03f81db82322215ce027c1e0.tar.bz2 |
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)
Tested-by: Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de>
Diffstat (limited to 'libFLAC/include/protected/all.h')
-rw-r--r-- | libFLAC/include/protected/all.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libFLAC/include/protected/all.h b/libFLAC/include/protected/all.h index 2921092..90912af 100644 --- a/libFLAC/include/protected/all.h +++ b/libFLAC/include/protected/all.h @@ -1,5 +1,6 @@ /* libFLAC - Free Lossless Audio Codec library - * Copyright (C) 2001,2002,2003,2004,2005,2006,2007 Josh Coalson + * Copyright (C) 2001-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 |