diff options
| author | Robert Shih <robertshih@google.com> | 2015-03-23 15:08:12 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-23 15:08:12 +0000 |
| commit | 214b9dfabe821b7653bfe8db424942575fbd6167 (patch) | |
| tree | fa607172a51170011043a907c3a475da4c60c24a /libFLAC/include/private/ogg_helper.h | |
| parent | 9aad9a2b9f7f54dd9ba65d7577afa0a9fe77869e (diff) | |
| parent | fe03f73d86bb415f5d5145f0de091834d89ae3a9 (diff) | |
| download | android_external_flac-214b9dfabe821b7653bfe8db424942575fbd6167.tar.gz android_external_flac-214b9dfabe821b7653bfe8db424942575fbd6167.tar.bz2 android_external_flac-214b9dfabe821b7653bfe8db424942575fbd6167.zip | |
am fe03f73d: libFLAC: merge master from Xiph
* commit 'fe03f73d86bb415f5d5145f0de091834d89ae3a9':
libFLAC: merge master from Xiph
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 |