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 /libFLAC/include/private/ogg_helper.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 'libFLAC/include/private/ogg_helper.h')
| -rw-r--r-- | libFLAC/include/private/ogg_helper.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libFLAC/include/private/ogg_helper.h b/libFLAC/include/private/ogg_helper.h index 389be18..87b96ef 100644 --- a/libFLAC/include/private/ogg_helper.h +++ b/libFLAC/include/private/ogg_helper.h @@ -1,5 +1,6 @@ /* libFLAC - Free Lossless Audio Codec - * Copyright (C) 2004,2005,2006,2007 Josh Coalson + * Copyright (C) 2004-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 |