Mercurial > mplayer.hg
changeset 19251:cd6b211be811
Replace tremor files that had old headers saying "ALL REDISTRIBUTION
RIGHTS RESERVED" with files taken from revision r3989 of upstream svn.
| author | uau |
|---|---|
| date | Sun, 30 Jul 2006 01:41:58 +0000 |
| parents | 1ba1f19a30e9 |
| children | 9757c44cae9a |
| files | tremor/backends.h tremor/block.c tremor/codebook.c tremor/codebook.h tremor/codec_internal.h tremor/info.c tremor/ivorbiscodec.h tremor/lsp_lookup.h tremor/mapping0.c tremor/os.h tremor/registry.c tremor/registry.h tremor/res012.c tremor/sharedbook.c tremor/synthesis.c |
| diffstat | 15 files changed, 64 insertions(+), 18 deletions(-) [+] |
line wrap: on
line diff
--- a/tremor/backends.h Sat Jul 29 23:30:55 2006 +0000 +++ b/tremor/backends.h Sun Jul 30 01:41:58 2006 +0000 @@ -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. * * * ********************************************************************
--- a/tremor/block.c Sat Jul 29 23:30:55 2006 +0000 +++ b/tremor/block.c Sun Jul 30 01:41:58 2006 +0000 @@ -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. * * * ********************************************************************
--- a/tremor/codebook.c Sat Jul 29 23:30:55 2006 +0000 +++ b/tremor/codebook.c Sun Jul 30 01:41:58 2006 +0000 @@ -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. * * * ********************************************************************
--- a/tremor/codebook.h Sat Jul 29 23:30:55 2006 +0000 +++ b/tremor/codebook.h Sun Jul 30 01:41:58 2006 +0000 @@ -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. * * * ********************************************************************
--- a/tremor/codec_internal.h Sat Jul 29 23:30:55 2006 +0000 +++ b/tremor/codec_internal.h Sun Jul 30 01:41:58 2006 +0000 @@ -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. * * * ********************************************************************
--- a/tremor/info.c Sat Jul 29 23:30:55 2006 +0000 +++ b/tremor/info.c Sun Jul 30 01:41:58 2006 +0000 @@ -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. * * * ********************************************************************
--- a/tremor/ivorbiscodec.h Sat Jul 29 23:30:55 2006 +0000 +++ b/tremor/ivorbiscodec.h Sun Jul 30 01:41:58 2006 +0000 @@ -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. * * * ********************************************************************
--- a/tremor/lsp_lookup.h Sat Jul 29 23:30:55 2006 +0000 +++ b/tremor/lsp_lookup.h Sun Jul 30 01:41:58 2006 +0000 @@ -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. * * * ********************************************************************
--- a/tremor/mapping0.c Sat Jul 29 23:30:55 2006 +0000 +++ b/tremor/mapping0.c Sun Jul 30 01:41:58 2006 +0000 @@ -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. * * * ********************************************************************
--- a/tremor/os.h Sat Jul 29 23:30:55 2006 +0000 +++ b/tremor/os.h Sun Jul 30 01:41:58 2006 +0000 @@ -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. * * * ********************************************************************
--- a/tremor/registry.c Sat Jul 29 23:30:55 2006 +0000 +++ b/tremor/registry.c Sun Jul 30 01:41:58 2006 +0000 @@ -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. * * * ********************************************************************
--- a/tremor/registry.h Sat Jul 29 23:30:55 2006 +0000 +++ b/tremor/registry.h Sun Jul 30 01:41:58 2006 +0000 @@ -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. * * * ********************************************************************
--- a/tremor/res012.c Sat Jul 29 23:30:55 2006 +0000 +++ b/tremor/res012.c Sun Jul 30 01:41:58 2006 +0000 @@ -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. * * * ********************************************************************
--- a/tremor/sharedbook.c Sat Jul 29 23:30:55 2006 +0000 +++ b/tremor/sharedbook.c Sun Jul 30 01:41:58 2006 +0000 @@ -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 @@ 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 @@ 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 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 */
--- a/tremor/synthesis.c Sat Jul 29 23:30:55 2006 +0000 +++ b/tremor/synthesis.c Sun Jul 30 01:41:58 2006 +0000 @@ -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. * * * ********************************************************************