diff options
| author | Robert Shih <robertshih@google.com> | 2015-01-05 17:35:54 -0800 |
|---|---|---|
| committer | Brint E. Kriebel <bekit@cyngn.com> | 2015-03-18 16:56:52 -0700 |
| commit | 47c292e8e05dfde61724ddcd119ff779d73607ed (patch) | |
| tree | ae9f7fe4f7729153eff872fdbf1b1463ad17a1b6 /libFLAC/include/private/format.h | |
| parent | 2d7ee624e1dc703fb66f6b186888be64c7e97434 (diff) | |
| download | android_external_flac-cm-12.0.tar.gz android_external_flac-cm-12.0.tar.bz2 android_external_flac-cm-12.0.zip | |
libFLAC: merge master from Xiphstable/cm-12.0-YNG4Nstable/cm-12.0-YNG3Ccm-12.0
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/format.h')
| -rw-r--r-- | libFLAC/include/private/format.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libFLAC/include/private/format.h b/libFLAC/include/private/format.h index 7f5cc93..2fd3460 100644 --- a/libFLAC/include/private/format.h +++ b/libFLAC/include/private/format.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 |