summaryrefslogtreecommitdiffstats
path: root/tremor
diff options
context:
space:
mode:
authoruau <uau@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-07-30 01:41:58 +0000
committeruau <uau@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-07-30 01:41:58 +0000
commit2a2cc8fa7838638df8f4bdf1529864647e1a86dd (patch)
tree8fc7a21f2513d47d27a57361068722f1fe101c7e /tremor
parent113e9b534b632f2c4791b1cec2c4dfbfb96cebf1 (diff)
downloadmpv-2a2cc8fa7838638df8f4bdf1529864647e1a86dd.tar.bz2
mpv-2a2cc8fa7838638df8f4bdf1529864647e1a86dd.tar.xz
Replace tremor files that had old headers saying "ALL REDISTRIBUTION
RIGHTS RESERVED" with files taken from revision r3989 of upstream svn. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19256 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'tremor')
-rw-r--r--tremor/backends.h5
-rw-r--r--tremor/block.c5
-rw-r--r--tremor/codebook.c5
-rw-r--r--tremor/codebook.h5
-rw-r--r--tremor/codec_internal.h5
-rw-r--r--tremor/info.c5
-rw-r--r--tremor/ivorbiscodec.h5
-rw-r--r--tremor/lsp_lookup.h5
-rw-r--r--tremor/mapping0.c5
-rw-r--r--tremor/os.h5
-rw-r--r--tremor/registry.c5
-rw-r--r--tremor/registry.h5
-rw-r--r--tremor/res012.c5
-rw-r--r--tremor/sharedbook.c12
-rw-r--r--tremor/synthesis.c5
15 files changed, 64 insertions, 18 deletions
diff --git a/tremor/backends.h b/tremor/backends.h
index 046e680fc9..50c1c45cfd 100644
--- a/tremor/backends.h
+++ b/tremor/backends.h
@@ -2,9 +2,12 @@
* *
* THIS FILE IS PART OF THE OggVorbis 'TREMOR' CODEC SOURCE CODE. *
* *
+ * USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS *
+ * GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE *
+ * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
+ * *
* THE OggVorbis 'TREMOR' SOURCE CODE IS (C) COPYRIGHT 1994-2002 *
* BY THE Xiph.Org FOUNDATION http://www.xiph.org/ *
- * ALL REDISTRIBUTION RIGHTS RESERVED. *
* *
********************************************************************
diff --git a/tremor/block.c b/tremor/block.c
index 546b756704..7f9c094061 100644
--- a/tremor/block.c
+++ b/tremor/block.c
@@ -2,9 +2,12 @@
* *
* THIS FILE IS PART OF THE OggVorbis 'TREMOR' CODEC SOURCE CODE. *
* *
+ * USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS *
+ * GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE *
+ * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
+ * *
* THE OggVorbis 'TREMOR' SOURCE CODE IS (C) COPYRIGHT 1994-2002 *
* BY THE Xiph.Org FOUNDATION http://www.xiph.org/ *
- * ALL REDISTRIBUTION RIGHTS RESERVED. *
* *
********************************************************************
diff --git a/tremor/codebook.c b/tremor/codebook.c
index 02834c868b..5da8957232 100644
--- a/tremor/codebook.c
+++ b/tremor/codebook.c
@@ -2,9 +2,12 @@
* *
* THIS FILE IS PART OF THE OggVorbis 'TREMOR' CODEC SOURCE CODE. *
* *
+ * USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS *
+ * GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE *
+ * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
+ * *
* THE OggVorbis 'TREMOR' SOURCE CODE IS (C) COPYRIGHT 1994-2002 *
* BY THE Xiph.Org FOUNDATION http://www.xiph.org/ *
- * ALL REDISTRIBUTION RIGHTS RESERVED. *
* *
********************************************************************
diff --git a/tremor/codebook.h b/tremor/codebook.h
index 13e5a146c1..14f65382dd 100644
--- a/tremor/codebook.h
+++ b/tremor/codebook.h
@@ -2,9 +2,12 @@
* *
* THIS FILE IS PART OF THE OggVorbis 'TREMOR' CODEC SOURCE CODE. *
* *
+ * USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS *
+ * GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE *
+ * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
+ * *
* THE OggVorbis 'TREMOR' SOURCE CODE IS (C) COPYRIGHT 1994-2002 *
* BY THE Xiph.Org FOUNDATION http://www.xiph.org/ *
- * ALL REDISTRIBUTION RIGHTS RESERVED. *
* *
********************************************************************
diff --git a/tremor/codec_internal.h b/tremor/codec_internal.h
index 5580164dba..1c92ab24c1 100644
--- a/tremor/codec_internal.h
+++ b/tremor/codec_internal.h
@@ -2,9 +2,12 @@
* *
* THIS FILE IS PART OF THE OggVorbis 'TREMOR' CODEC SOURCE CODE. *
* *
+ * USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS *
+ * GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE *
+ * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
+ * *
* THE OggVorbis 'TREMOR' SOURCE CODE IS (C) COPYRIGHT 1994-2002 *
* BY THE Xiph.Org FOUNDATION http://www.xiph.org/ *
- * ALL REDISTRIBUTION RIGHTS RESERVED. *
* *
********************************************************************
diff --git a/tremor/info.c b/tremor/info.c
index 51605f4898..72398b49ff 100644
--- a/tremor/info.c
+++ b/tremor/info.c
@@ -2,9 +2,12 @@
* *
* THIS FILE IS PART OF THE OggVorbis 'TREMOR' CODEC SOURCE CODE. *
* *
+ * USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS *
+ * GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE *
+ * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
+ * *
* THE OggVorbis 'TREMOR' SOURCE CODE IS (C) COPYRIGHT 1994-2002 *
* BY THE Xiph.Org FOUNDATION http://www.xiph.org/ *
- * ALL REDISTRIBUTION RIGHTS RESERVED. *
* *
********************************************************************
diff --git a/tremor/ivorbiscodec.h b/tremor/ivorbiscodec.h
index 51fb0b07f0..3d637f6921 100644
--- a/tremor/ivorbiscodec.h
+++ b/tremor/ivorbiscodec.h
@@ -2,9 +2,12 @@
* *
* THIS FILE IS PART OF THE OggVorbis 'TREMOR' CODEC SOURCE CODE. *
* *
+ * USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS *
+ * GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE *
+ * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
+ * *
* THE OggVorbis 'TREMOR' SOURCE CODE IS (C) COPYRIGHT 1994-2002 *
* BY THE Xiph.Org FOUNDATION http://www.xiph.org/ *
- * ALL REDISTRIBUTION RIGHTS RESERVED. *
* *
********************************************************************
diff --git a/tremor/lsp_lookup.h b/tremor/lsp_lookup.h
index 9cfee30afc..259dfec7c8 100644
--- a/tremor/lsp_lookup.h
+++ b/tremor/lsp_lookup.h
@@ -2,9 +2,12 @@
* *
* THIS FILE IS PART OF THE OggVorbis 'TREMOR' CODEC SOURCE CODE. *
* *
+ * USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS *
+ * GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE *
+ * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
+ * *
* THE OggVorbis 'TREMOR' SOURCE CODE IS (C) COPYRIGHT 1994-2002 *
* BY THE Xiph.Org FOUNDATION http://www.xiph.org/ *
- * ALL REDISTRIBUTION RIGHTS RESERVED. *
* *
********************************************************************
diff --git a/tremor/mapping0.c b/tremor/mapping0.c
index 173410cc4b..c721b47dab 100644
--- a/tremor/mapping0.c
+++ b/tremor/mapping0.c
@@ -2,9 +2,12 @@
* *
* THIS FILE IS PART OF THE OggVorbis 'TREMOR' CODEC SOURCE CODE. *
* *
+ * USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS *
+ * GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE *
+ * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
+ * *
* THE OggVorbis 'TREMOR' SOURCE CODE IS (C) COPYRIGHT 1994-2002 *
* BY THE Xiph.Org FOUNDATION http://www.xiph.org/ *
- * ALL REDISTRIBUTION RIGHTS RESERVED. *
* *
********************************************************************
diff --git a/tremor/os.h b/tremor/os.h
index 818c4a90fe..65a4992ffc 100644
--- a/tremor/os.h
+++ b/tremor/os.h
@@ -4,9 +4,12 @@
* *
* THIS FILE IS PART OF THE OggVorbis 'TREMOR' CODEC SOURCE CODE. *
* *
+ * USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS *
+ * GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE *
+ * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
+ * *
* THE OggVorbis 'TREMOR' SOURCE CODE IS (C) COPYRIGHT 1994-2002 *
* BY THE Xiph.Org FOUNDATION http://www.xiph.org/ *
- * ALL REDISTRIBUTION RIGHTS RESERVED. *
* *
********************************************************************
diff --git a/tremor/registry.c b/tremor/registry.c
index ea079d3d62..c0b5fec0cc 100644
--- a/tremor/registry.c
+++ b/tremor/registry.c
@@ -2,9 +2,12 @@
* *
* THIS FILE IS PART OF THE OggVorbis 'TREMOR' CODEC SOURCE CODE. *
* *
+ * USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS *
+ * GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE *
+ * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
+ * *
* THE OggVorbis 'TREMOR' SOURCE CODE IS (C) COPYRIGHT 1994-2002 *
* BY THE Xiph.Org FOUNDATION http://www.xiph.org/ *
- * ALL REDISTRIBUTION RIGHTS RESERVED. *
* *
********************************************************************
diff --git a/tremor/registry.h b/tremor/registry.h
index c15385aa87..2bc8068f69 100644
--- a/tremor/registry.h
+++ b/tremor/registry.h
@@ -2,9 +2,12 @@
* *
* THIS FILE IS PART OF THE OggVorbis 'TREMOR' CODEC SOURCE CODE. *
* *
+ * USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS *
+ * GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE *
+ * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
+ * *
* THE OggVorbis 'TREMOR' SOURCE CODE IS (C) COPYRIGHT 1994-2002 *
* BY THE Xiph.Org FOUNDATION http://www.xiph.org/ *
- * ALL REDISTRIBUTION RIGHTS RESERVED. *
* *
********************************************************************
diff --git a/tremor/res012.c b/tremor/res012.c
index d6f82d76e1..56e98f3c70 100644
--- a/tremor/res012.c
+++ b/tremor/res012.c
@@ -2,9 +2,12 @@
* *
* THIS FILE IS PART OF THE OggVorbis 'TREMOR' CODEC SOURCE CODE. *
* *
+ * USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS *
+ * GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE *
+ * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
+ * *
* THE OggVorbis 'TREMOR' SOURCE CODE IS (C) COPYRIGHT 1994-2002 *
* BY THE Xiph.Org FOUNDATION http://www.xiph.org/ *
- * ALL REDISTRIBUTION RIGHTS RESERVED. *
* *
********************************************************************
diff --git a/tremor/sharedbook.c b/tremor/sharedbook.c
index afc83e7386..a62211eed6 100644
--- a/tremor/sharedbook.c
+++ b/tremor/sharedbook.c
@@ -2,9 +2,12 @@
* *
* THIS FILE IS PART OF THE OggVorbis 'TREMOR' CODEC SOURCE CODE. *
* *
+ * USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS *
+ * GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE *
+ * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
+ * *
* THE OggVorbis 'TREMOR' SOURCE CODE IS (C) COPYRIGHT 1994-2002 *
* BY THE Xiph.Org FOUNDATION http://www.xiph.org/ *
- * ALL REDISTRIBUTION RIGHTS RESERVED. *
* *
********************************************************************
@@ -208,7 +211,7 @@ ogg_int32_t *_book_unquantize(const static_codebook *b,int n,int *sparsemap,
int indexdiv=1;
for(k=0;k<b->dim;k++){
int index= (j/indexdiv)%quantvals;
- ogg_int32_t point;
+ int point;
int val=VFLOAT_MULTI(delta,delpoint,
abs(b->quantlist[index]),&point);
@@ -242,7 +245,7 @@ ogg_int32_t *_book_unquantize(const static_codebook *b,int n,int *sparsemap,
int lastpoint=0;
for(k=0;k<b->dim;k++){
- ogg_int32_t point;
+ int point;
int val=VFLOAT_MULTI(delta,delpoint,
abs(b->quantlist[j*b->dim+k]),&point);
@@ -313,7 +316,8 @@ static ogg_uint32_t bitreverse(ogg_uint32_t x){
}
static int sort32a(const void *a,const void *b){
- return ( (**(ogg_uint32_t **)a>**(ogg_uint32_t **)b)<<1)-1;
+ return (**(ogg_uint32_t **)a>**(ogg_uint32_t **)b)-
+ (**(ogg_uint32_t **)a<**(ogg_uint32_t **)b);
}
/* decode codebook arrangement is more heavily optimized than encode */
diff --git a/tremor/synthesis.c b/tremor/synthesis.c
index 988acea6fb..3d9048dfc6 100644
--- a/tremor/synthesis.c
+++ b/tremor/synthesis.c
@@ -2,9 +2,12 @@
* *
* THIS FILE IS PART OF THE OggVorbis 'TREMOR' CODEC SOURCE CODE. *
* *
+ * USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS *
+ * GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE *
+ * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
+ * *
* THE OggVorbis 'TREMOR' SOURCE CODE IS (C) COPYRIGHT 1994-2002 *
* BY THE Xiph.Org FOUNDATION http://www.xiph.org/ *
- * ALL REDISTRIBUTION RIGHTS RESERVED. *
* *
********************************************************************
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-27 11:30:02 +0000