Author: dnicholson
Date: 2006-03-06 17:05:33 -0700 (Mon, 06 Mar 2006)
New Revision: 1431
Modified:
trunk/libvorbis/libvorbis-1.1.2-aotuv_encoder-1.patch
Log:
Removed missed .rej file from previous libvorbis patch
Modified: trunk/libvorbis/libvorbis-1.1.2-aotuv_encoder-1.patch
===================================================================
--- trunk/libvorbis/libvorbis-1.1.2-aotuv_encoder-1.patch 2006-03-06
16:47:47 UTC (rev 1430)
+++ trunk/libvorbis/libvorbis-1.1.2-aotuv_encoder-1.patch 2006-03-07
00:05:33 UTC (rev 1431)
@@ -3127,91 +3127,6 @@
#endif
-diff -Naur libvorbis-1.1.2.orig/lib/scales.h.rej
libvorbis-1.1.2/lib/scales.h.rej
---- libvorbis-1.1.2.orig/lib/scales.h.rej 1970-01-01 00:00:00.000000000
+0000
-+++ libvorbis-1.1.2/lib/scales.h.rej 2006-03-06 15:46:45.000000000 +0000
-@@ -0,0 +1,81 @@
-+***************
-+*** 11,17
-+ ********************************************************************
-+
-+ function: linear scale -> dB, Bark and Mel scales
-+! last mod: $Id: scales.h 7263 2004-07-23 01:23:40Z msmith $
-+
-+ ********************************************************************/
-+
-+--- 11,17 -----
-+ ********************************************************************
-+
-+ function: linear scale -> dB, Bark and Mel scales
-+! last mod: $Id: scales.h 9959 2005-09-05 11:04:48Z msmith $
-+
-+ ********************************************************************/
-+
-+***************
-+*** 26,45 ****
-+ #ifdef VORBIS_IEEE_FLOAT32
-+
-+ static float unitnorm(float x){
-+! ogg_uint32_t *ix=(ogg_uint32_t *)&x;
-+! *ix=(*ix&0x80000000UL)|(0x3f800000UL);
-+! return(x);
-+ }
-+
-+- static float FABS(float *x){
-+- ogg_uint32_t *ix=(ogg_uint32_t *)x;
-+- *ix&=0x7fffffffUL;
-+- return(*x);
-+- }
-+-
-+ /* Segher was off (too high) by ~ .3 decibel. Center the conversion
correctly. */
-+ static float todB(const float *x){
-+! return (float)((*(ogg_int32_t *)x)&0x7fffffff) * 7.17711438e-7f
-764.6161886f;
-+ }
-+
-+ #define todB_nn(x) todB(x)
-+--- 26,49 ----
-+ #ifdef VORBIS_IEEE_FLOAT32
-+
-+ static float unitnorm(float x){
-+! union {
-+! ogg_uint32_t i;
-+! float f;
-+! } ix;
-+! ix.f = x;
-+! ix.i = (ix.i & 0x80000000U) | (0x3f800000U);
-+! return ix.f;
-+ }
-+
-+ /* Segher was off (too high) by ~ .3 decibel. Center the conversion
correctly. */
-+ static float todB(const float *x){
-+! union {
-+! ogg_uint32_t i;
-+! float f;
-+! } ix;
-+! ix.f = *x;
-+! ix.i = ix.i&0x7fffffff;
-+! return (float)(ix.i * 7.17711438e-7f -764.6161886f);
-+ }
-+
-+ #define todB_nn(x) todB(x)
-+***************
-+*** 50,57 ****
-+ if(x<0)return(-1.f);
-+ return(1.f);
-+ }
-+-
-+- #define FABS(x) fabs(*(x))
-+
-+ #define todB(x) (*(x)==0?-400.f:log(*(x)**(x))*4.34294480f)
-+ #define todB_nn(x) (*(x)==0.f?-400.f:log(*(x))*8.6858896f)
-+--- 54,59 ----
-+ if(x<0)return(-1.f);
-+ return(1.f);
-+ }
-+
-+ #define todB(x) (*(x)==0?-400.f:log(*(x)**(x))*4.34294480f)
-+ #define todB_nn(x) (*(x)==0.f?-400.f:log(*(x))*8.6858896f)
diff -Naur libvorbis-1.1.2.orig/lib/vorbisenc.c libvorbis-1.1.2/lib/vorbisenc.c
--- libvorbis-1.1.2.orig/lib/vorbisenc.c 2005-11-28 05:43:25.000000000
+0000
+++ libvorbis-1.1.2/lib/vorbisenc.c 2006-03-06 15:46:45.000000000 +0000
--
http://linuxfromscratch.org/mailman/listinfo/patches
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
