From 2a2cc8fa7838638df8f4bdf1529864647e1a86dd Mon Sep 17 00:00:00 2001 From: uau Date: Sun, 30 Jul 2006 01:41:58 +0000 Subject: 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 --- tremor/backends.h | 5 ++++- tremor/block.c | 5 ++++- tremor/codebook.c | 5 ++++- tremor/codebook.h | 5 ++++- tremor/codec_internal.h | 5 ++++- tremor/info.c | 5 ++++- tremor/ivorbiscodec.h | 5 ++++- tremor/lsp_lookup.h | 5 ++++- tremor/mapping0.c | 5 ++++- tremor/os.h | 5 ++++- tremor/registry.c | 5 ++++- tremor/registry.h | 5 ++++- tremor/res012.c | 5 ++++- tremor/sharedbook.c | 12 ++++++++---- tremor/synthesis.c | 5 ++++- 15 files changed, 64 insertions(+), 18 deletions(-) (limited to 'tremor') 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;kdim;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;kdim;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. * * * ******************************************************************** -- cgit v1.2.3