diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-07-07 02:56:01 +0300 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-07-07 02:56:01 +0300 |
commit | a2037a2effbd4622d0e8336245a9b14c3f886bde (patch) | |
tree | bd2face6dd36d2663197b23a33da9e9b2814f70c /tremor/misc.h | |
parent | 0c2773a709276681575d2507aa60ee85c2d0b850 (diff) | |
parent | 43079c51daa8c12b0a44e5ad8022c979dd9e8336 (diff) | |
download | mpv-a2037a2effbd4622d0e8336245a9b14c3f886bde.tar.bz2 mpv-a2037a2effbd4622d0e8336245a9b14c3f886bde.tar.xz |
Merge svn changes up to r29412
Diffstat (limited to 'tremor/misc.h')
-rw-r--r-- | tremor/misc.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tremor/misc.h b/tremor/misc.h index fc7c12506c..cb9b66a678 100644 --- a/tremor/misc.h +++ b/tremor/misc.h @@ -21,10 +21,10 @@ #include "os_types.h" #include "asm_arm.h" - + #ifndef _V_WIDE_MATH #define _V_WIDE_MATH - + #ifndef _LOW_ACCURACY_ /* 64 bit multiply */ @@ -76,7 +76,7 @@ static inline ogg_int32_t MULT31_SHIFT15(ogg_int32_t x, ogg_int32_t y) { /* * For MULT32 and MULT31: The second argument is always a lookup table - * value already preshifted from 31 to 8 bits. We therefore take the + * value already preshifted from 31 to 8 bits. We therefore take the * opportunity to save on text space and use unsigned char for those * tables in this case. */ @@ -175,7 +175,7 @@ static inline ogg_int32_t VFLOAT_MULT(ogg_int32_t a,ogg_int32_t ap, return MULT32(a,b); #else *p=ap+bp+31; - return (a>>15)*(b>>16); + return (a>>15)*(b>>16); #endif }else return 0; @@ -223,7 +223,7 @@ static inline ogg_int32_t VFLOAT_ADD(ogg_int32_t a,ogg_int32_t ap, } a+=b; - if((a&0xc0000000)==0xc0000000 || + if((a&0xc0000000)==0xc0000000 || (a&0xc0000000)==0){ a<<=1; (*p)--; |