summaryrefslogtreecommitdiff
path: root/lib/masking.h
diff options
context:
space:
mode:
authorMonty <xiphmont@xiph.org>2000-11-06 00:07:26 +0000
committerMonty <xiphmont@xiph.org>2000-11-06 00:07:26 +0000
commit5e1fb9030d5cededd728d1e5798a3114c631b50e (patch)
treea6d80fdb12de7387e9f4cb3556961a88eda13ea9 /lib/masking.h
parent3241b24575ca4915833b693846be7d35ef8f0155 (diff)
downloadlibvorbis-git-5e1fb9030d5cededd728d1e5798a3114c631b50e.tar.gz
Merge branch_beta3 onto the mainline.
Monty svn path=/trunk/vorbis/; revision=990
Diffstat (limited to 'lib/masking.h')
-rw-r--r--lib/masking.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/masking.h b/lib/masking.h
index 7d206628..dbd5b8cb 100644
--- a/lib/masking.h
+++ b/lib/masking.h
@@ -1,18 +1,18 @@
/********************************************************************
* *
- * THIS FILE IS PART OF THE Ogg Vorbis SOFTWARE CODEC SOURCE CODE. *
+ * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE. *
* USE, DISTRIBUTION AND REPRODUCTION OF THIS SOURCE IS GOVERNED BY *
- * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE. *
- * PLEASE READ THESE TERMS DISTRIBUTING. *
+ * THE GNU LESSER/LIBRARY PUBLIC LICENSE, WHICH IS INCLUDED WITH *
+ * THIS SOURCE. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
* *
- * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-2000 *
- * by Monty <monty@xiph.org> and The XIPHOPHORUS Company *
+ * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2000 *
+ * by Monty <monty@xiph.org> and the XIPHOPHORUS Company *
* http://www.xiph.org/ *
* *
********************************************************************
function: masking curve data for psychoacoustics
- last mod: $Id: masking.h,v 1.5 2000/10/12 03:12:53 xiphmont Exp $
+ last mod: $Id: masking.h,v 1.6 2000/11/06 00:07:01 xiphmont Exp $
********************************************************************/