diff options
| author | Robert Shih <robertshih@google.com> | 2015-03-23 15:23:15 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-23 15:23:15 +0000 |
| commit | 39b2a5bb953dc7465ff44b897a637ce3d52836d1 (patch) | |
| tree | fa607172a51170011043a907c3a475da4c60c24a /libFLAC/include/private/bitwriter.h | |
| parent | 068926919b76b051635b711555429c6df0faeaa9 (diff) | |
| parent | 214b9dfabe821b7653bfe8db424942575fbd6167 (diff) | |
| download | android_external_flac-39b2a5bb953dc7465ff44b897a637ce3d52836d1.tar.gz android_external_flac-39b2a5bb953dc7465ff44b897a637ce3d52836d1.tar.bz2 android_external_flac-39b2a5bb953dc7465ff44b897a637ce3d52836d1.zip | |
am 214b9dfa: am fe03f73d: libFLAC: merge master from Xiph
* commit '214b9dfabe821b7653bfe8db424942575fbd6167':
libFLAC: merge master from Xiph
Diffstat (limited to 'libFLAC/include/private/bitwriter.h')
| -rw-r--r-- | libFLAC/include/private/bitwriter.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libFLAC/include/private/bitwriter.h b/libFLAC/include/private/bitwriter.h index aa5c4f7..3b1362d 100644 --- a/libFLAC/include/private/bitwriter.h +++ b/libFLAC/include/private/bitwriter.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 |