[MPlayer-cvslog] r19256 - in trunk/tremor: backends.h block.c codebook.c codebook.h codec_internal.h info.c ivorbiscodec.h lsp_lookup.h mapping0.c os.h registry.c registry.h res012.c sharedbook.c synthesis.c

uau subversion at mplayerhq.hu
Sun Jul 30 03:41:59 CEST 2006


Author: uau
Date: Sun Jul 30 03:41:58 2006
New Revision: 19256

Modified:
   trunk/tremor/backends.h
   trunk/tremor/block.c
   trunk/tremor/codebook.c
   trunk/tremor/codebook.h
   trunk/tremor/codec_internal.h
   trunk/tremor/info.c
   trunk/tremor/ivorbiscodec.h
   trunk/tremor/lsp_lookup.h
   trunk/tremor/mapping0.c
   trunk/tremor/os.h
   trunk/tremor/registry.c
   trunk/tremor/registry.h
   trunk/tremor/res012.c
   trunk/tremor/sharedbook.c
   trunk/tremor/synthesis.c

Log:
Replace tremor files that had old headers saying "ALL REDISTRIBUTION
RIGHTS RESERVED" with files taken from revision r3989 of upstream svn.


Modified: trunk/tremor/backends.h
==============================================================================
--- trunk/tremor/backends.h	(original)
+++ trunk/tremor/backends.h	Sun Jul 30 03:41:58 2006
@@ -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.                              *
  *                                                                  *
  ********************************************************************
 

Modified: trunk/tremor/block.c
==============================================================================
--- trunk/tremor/block.c	(original)
+++ trunk/tremor/block.c	Sun Jul 30 03:41:58 2006
@@ -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.                              *
  *                                                                  *
  ********************************************************************
 

Modified: trunk/tremor/codebook.c
==============================================================================
--- trunk/tremor/codebook.c	(original)
+++ trunk/tremor/codebook.c	Sun Jul 30 03:41:58 2006
@@ -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.                              *
  *                                                                  *
  ********************************************************************
 

Modified: trunk/tremor/codebook.h
==============================================================================
--- trunk/tremor/codebook.h	(original)
+++ trunk/tremor/codebook.h	Sun Jul 30 03:41:58 2006
@@ -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.                              *
  *                                                                  *
  ********************************************************************
 

Modified: trunk/tremor/codec_internal.h
==============================================================================
--- trunk/tremor/codec_internal.h	(original)
+++ trunk/tremor/codec_internal.h	Sun Jul 30 03:41:58 2006
@@ -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.                              *
  *                                                                  *
  ********************************************************************
 

Modified: trunk/tremor/info.c
==============================================================================
--- trunk/tremor/info.c	(original)
+++ trunk/tremor/info.c	Sun Jul 30 03:41:58 2006
@@ -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.                              *
  *                                                                  *
  ********************************************************************
 

Modified: trunk/tremor/ivorbiscodec.h
==============================================================================
--- trunk/tremor/ivorbiscodec.h	(original)
+++ trunk/tremor/ivorbiscodec.h	Sun Jul 30 03:41:58 2006
@@ -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.                              *
  *                                                                  *
  ********************************************************************
 

Modified: trunk/tremor/lsp_lookup.h
==============================================================================
--- trunk/tremor/lsp_lookup.h	(original)
+++ trunk/tremor/lsp_lookup.h	Sun Jul 30 03:41:58 2006
@@ -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.                              *
  *                                                                  *
  ********************************************************************
 

Modified: trunk/tremor/mapping0.c
==============================================================================
--- trunk/tremor/mapping0.c	(original)
+++ trunk/tremor/mapping0.c	Sun Jul 30 03:41:58 2006
@@ -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.                              *
  *                                                                  *
  ********************************************************************
 

Modified: trunk/tremor/os.h
==============================================================================
--- trunk/tremor/os.h	(original)
+++ trunk/tremor/os.h	Sun Jul 30 03:41:58 2006
@@ -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.                              *
  *                                                                  *
  ********************************************************************
 

Modified: trunk/tremor/registry.c
==============================================================================
--- trunk/tremor/registry.c	(original)
+++ trunk/tremor/registry.c	Sun Jul 30 03:41:58 2006
@@ -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.                              *
  *                                                                  *
  ********************************************************************
 

Modified: trunk/tremor/registry.h
==============================================================================
--- trunk/tremor/registry.h	(original)
+++ trunk/tremor/registry.h	Sun Jul 30 03:41:58 2006
@@ -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.                              *
  *                                                                  *
  ********************************************************************
 

Modified: trunk/tremor/res012.c
==============================================================================
--- trunk/tremor/res012.c	(original)
+++ trunk/tremor/res012.c	Sun Jul 30 03:41:58 2006
@@ -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.                              *
  *                                                                  *
  ********************************************************************
 

Modified: trunk/tremor/sharedbook.c
==============================================================================
--- trunk/tremor/sharedbook.c	(original)
+++ trunk/tremor/sharedbook.c	Sun Jul 30 03:41:58 2006
@@ -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 */

Modified: trunk/tremor/synthesis.c
==============================================================================
--- trunk/tremor/synthesis.c	(original)
+++ trunk/tremor/synthesis.c	Sun Jul 30 03:41:58 2006
@@ -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.                              *
  *                                                                  *
  ********************************************************************
 



More information about the MPlayer-cvslog mailing list