[Ffmpeg-cvslog] CVS: ffmpeg/libavutil Makefile, 1.5, 1.6 bswap.h, 1.10, 1.11 common.h, 1.157, 1.158 eval.c, 1.10, 1.11 integer.c, 1.2, 1.3 integer.h, 1.1, 1.2 intfloat_readwrite.c, 1.2, 1.3 mathematics.c, 1.1, 1.2 rational.c, 1.5, 1.6 rational.h, 1.3, 1.4

Diego Biurrun CVS diego
Sat Dec 17 19:14:43 CET 2005 

Update of /cvsroot/ffmpeg/ffmpeg/libavutil
In directory mail:/var2/tmp/cvs-serv18206/libavutil

Modified Files:
	Makefile bswap.h common.h eval.c integer.c integer.h 
	intfloat_readwrite.c mathematics.c rational.c rational.h 
Log Message:
COSMETICS: Remove all trailing whitespace.


Index: Makefile
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavutil/Makefile,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Makefile	10 Dec 2005 17:14:24 -0000	1.5
+++ Makefile	17 Dec 2005 18:14:37 -0000	1.6
@@ -45,7 +45,7 @@
 endif
 
 %.o: %.c
-	$(CC) $(CFLAGS) $(LIBOBJFLAGS) -c -o $@ $< 
+	$(CC) $(CFLAGS) $(LIBOBJFLAGS) -c -o $@ $<
 
 depend: $(SRCS)
 	$(CC) -MM $(CFLAGS) $^ 1>.depend

Index: bswap.h
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavutil/bswap.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- bswap.h	26 May 2005 14:32:46 -0000	1.10
+++ bswap.h	17 Dec 2005 18:14:37 -0000	1.11
@@ -48,7 +48,7 @@
         "0" (x));
   return x;
 #else
-    union { 
+    union {
         uint64_t ll;
         struct {
            uint32_t l,h;
@@ -78,7 +78,7 @@
 
 static inline uint64_t bswap_64(uint64_t x)
 {
-    union { 
+    union {
         uint64_t ll;
         struct {
            uint32_t l,h;
@@ -119,9 +119,9 @@
     x= ((x<<16)&0xFFFF0000FFFF0000ULL) | ((x>>16)&0x0000FFFF0000FFFFULL);
     return (x>>32) | (x<<32);
 #else
-    union { 
+    union {
         uint64_t ll;
-        uint32_t l[2]; 
+        uint32_t l[2];
     } w, r;
     w.ll = x;
     r.l[0] = bswap_32 (w.l[1]);

Index: common.h
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavutil/common.h,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -d -r1.157 -r1.158
--- common.h	13 Dec 2005 20:24:31 -0000	1.157
+++ common.h	17 Dec 2005 18:14:37 -0000	1.158
@@ -171,8 +171,8 @@
 #endif
 
 #if defined(CONFIG_OS2) || defined(CONFIG_SUNOS)
-static inline float floorf(float f) { 
-    return floor(f); 
+static inline float floorf(float f) {
+    return floor(f);
 }
 #endif
 
@@ -311,7 +311,7 @@
 #else
 #    define FASTDIV(a,b)   ((a)/(b))
 #endif
- 
+
 /* define it to include statistics code (useful only for optimizing
    codec efficiency */
 //#define STATS
@@ -424,9 +424,9 @@
     int ret=0;
     int s;
     int ret_sq=0;
-    
+
     if(a<128) return ff_sqrt_tab[a];
-    
+
     for(s=15; s>=0; s--){
         int b= ret_sq + (1<<(s*2)) + (ret<<s)*2;
         if(b<=a){
@@ -544,7 +544,7 @@
   }\
 }
 #else
-#define START_TIMER 
+#define START_TIMER
 #define STOP_TIMER(id) {}
 #endif
 

Index: eval.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavutil/eval.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- eval.c	17 Jan 2005 18:25:32 -0000	1.10
+++ eval.c	17 Dec 2005 18:14:37 -0000	1.11
@@ -75,7 +75,7 @@
         p->s= next;
         return d;
     }
-    
+
     /* named constants */
     for(i=0; p->const_name && p->const_name[i]; i++){
         if(strmatch(p->s, p->const_name[i])){
@@ -83,7 +83,7 @@
             return p->const_value[i];
         }
     }
-    
+
     p->s= strchr(p->s, '(');
     if(p->s==NULL){
         av_log(NULL, AV_LOG_ERROR, "Parser: missing ( in \"%s\"\n", next);
@@ -100,7 +100,7 @@
         return NAN;
     }
     p->s++; // ")"
-    
+
          if( strmatch(next, "sinh"  ) ) d= sinh(d);
     else if( strmatch(next, "cosh"  ) ) d= cosh(d);
     else if( strmatch(next, "tanh"  ) ) d= tanh(d);
@@ -140,7 +140,7 @@
     }
 
     return d;
-}      
+}
 
 static double evalPow(Parser *p){
     int sign= (*p->s == '+') - (*p->s == '-');
@@ -187,7 +187,7 @@
                double (**func2)(void *, double, double), char **func2_name,
                void *opaque){
     Parser p;
-    
+
     p.stack_index=100;
     p.s= s;
     p.const_value= const_value;
@@ -197,12 +197,12 @@
     p.func2      = func2;
     p.func2_name = func2_name;
     p.opaque     = opaque;
-    
+
     return evalExpression(&p);
 }
 
 #ifdef TEST
-#undef printf 
+#undef printf
 static double const_values[]={
     M_PI,
     M_E,
@@ -216,7 +216,7 @@
 main(){
     int i;
     printf("%f == 12.7\n", ff_eval("1+(5-2)^(3-1)+1/2+sin(PI)-max(-2.2,-3.1)", const_values, const_names, NULL, NULL, NULL, NULL, NULL));
-    
+
     for(i=0; i<1050; i++){
         START_TIMER
             ff_eval("1+(5-2)^(3-1)+1/2+sin(PI)-max(-2.2,-3.1)", const_values, const_names, NULL, NULL, NULL, NULL, NULL);

Index: integer.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavutil/integer.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- integer.c	15 Jul 2004 14:06:39 -0000	1.2
+++ integer.c	17 Dec 2005 18:14:37 -0000	1.3
@@ -17,7 +17,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  */
- 
+
 /**
  * @file integer.c
  * arbitrary precision integers.
@@ -29,7 +29,7 @@
 
 AVInteger av_add_i(AVInteger a, AVInteger b){
     int i, carry=0;
-    
+
     for(i=0; i<AV_INTEGER_SIZE; i++){
         carry= (carry>>16) + a.v[i] + b.v[i];
         a.v[i]= carry;
@@ -39,7 +39,7 @@
 
 AVInteger av_sub_i(AVInteger a, AVInteger b){
     int i, carry=0;
-    
+
     for(i=0; i<AV_INTEGER_SIZE; i++){
         carry= (carry>>16) + a.v[i] - b.v[i];
         a.v[i]= carry;
@@ -66,12 +66,12 @@
     int i, j;
     int na= (av_log2_i(a)+16) >> 4;
     int nb= (av_log2_i(b)+16) >> 4;
-    
+
     memset(&out, 0, sizeof(out));
-    
+
     for(i=0; i<na; i++){
         unsigned int carry=0;
-        
+
         if(a.v[i])
             for(j=i; j<AV_INTEGER_SIZE && j-i<=nb; j++){
                 carry= (carry>>16) + out.v[j] + a.v[i]*b.v[j-i];
@@ -86,10 +86,10 @@
  * returns 0 if a==b, 1 if a>b and -1 if a<b.
  */
 int av_cmp_i(AVInteger a, AVInteger b){
-    int i; 
+    int i;
     int v= (int16_t)a.v[AV_INTEGER_SIZE-1] - (int16_t)b.v[AV_INTEGER_SIZE-1];
     if(v) return (v>>16)|1;
-    
+
     for(i=AV_INTEGER_SIZE-2; i>=0; i--){
         int v= a.v[i] - b.v[i];
         if(v) return (v>>16)|1;
@@ -123,13 +123,13 @@
     int i= av_log2_i(a) - av_log2_i(b);
     AVInteger quot_temp;
     if(!quot) quot = &quot_temp;
-    
+
     assert((int16_t)a[AV_INTEGER_SIZE-1] >= 0 && (int16_t)b[AV_INTEGER_SIZE-1] >= 0);
     assert(av_log2(b)>=0);
-    
+
     if(i > 0)
         b= av_shr_i(b, -i);
-        
+
     memset(quot, 0, sizeof(AVInteger));
 
     while(i-- >= 0){
@@ -158,7 +158,7 @@
 AVInteger av_int2i(int64_t a){
     AVInteger out;
     int i;
-    
+
     for(i=0; i<AV_INTEGER_SIZE; i++){
         out.v[i]= a;
         a>>=16;
@@ -168,13 +168,13 @@
 
 /**
  * converts the given AVInteger to an int64_t.
- * if the AVInteger is too large to fit into an int64_t, 
+ * if the AVInteger is too large to fit into an int64_t,
  * then only the least significant 64bit will be used
  */
 int64_t av_i2int(AVInteger a){
     int i;
     int64_t out=(int8_t)a.v[AV_INTEGER_SIZE-1];
-    
+
     for(i= AV_INTEGER_SIZE-2; i>=0; i--){
         out = (out<<16) + a.v[i];
     }
@@ -203,7 +203,7 @@
         for(b=3; b<256*256*256; b+=27118){
             AVInteger ai= av_int2i(a);
             AVInteger bi= av_int2i(b);
-            
+
             assert(av_i2int(ai) == a);
             assert(av_i2int(bi) == b);
             assert(av_i2int(av_add_i(ai,bi)) == a+b);

Index: integer.h
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavutil/integer.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- integer.h	4 May 2004 02:51:18 -0000	1.1
+++ integer.h	17 Dec 2005 18:14:37 -0000	1.2
@@ -17,20 +17,20 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  */
- 
+
 /**
  * @file integer.h
  * arbitrary precision integers
  * @author Michael Niedermayer <michaelni at gmx.at>
  */
- 
+
 #ifndef INTEGER_H
 #define INTEGER_H
 
 #define AV_INTEGER_SIZE 8
 
 typedef struct AVInteger{
-    uint16_t v[AV_INTEGER_SIZE]; 
+    uint16_t v[AV_INTEGER_SIZE];
 } AVInteger;
 
 AVInteger av_add_i(AVInteger a, AVInteger b);

Index: intfloat_readwrite.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavutil/intfloat_readwrite.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- intfloat_readwrite.c	14 Aug 2005 15:42:40 -0000	1.2
+++ intfloat_readwrite.c	17 Dec 2005 18:14:37 -0000	1.3
@@ -17,12 +17,12 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
- 
+
 /**
  * @file intfloat_readwrite.c
  * Portable IEEE float/double read/write functions.
  */
- 
+
 #include "common.h"
 
 double av_int2dbl(int64_t v){

Index: mathematics.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavutil/mathematics.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- mathematics.c	1 Aug 2005 20:07:04 -0000	1.1
+++ mathematics.c	17 Dec 2005 18:14:37 -0000	1.2
@@ -15,7 +15,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
- 
+
 /**
  * @file mathematics.c
  * Miscellaneous math routines and tables.
@@ -54,9 +54,9 @@
     assert(c > 0);
     assert(b >=0);
     assert(rnd >=0 && rnd<=5 && rnd!=4);
-    
-    if(a<0 && a != INT64_MIN) return -av_rescale_rnd(-a, b, c, rnd ^ ((rnd>>1)&1)); 
-    
+
+    if(a<0 && a != INT64_MIN) return -av_rescale_rnd(-a, b, c, rnd ^ ((rnd>>1)&1));
+
     if(rnd==AV_ROUND_NEAR_INF) r= c/2;
     else if(rnd&1)             r= c-1;
 
@@ -66,10 +66,10 @@
         else
             return a/c*b + (a%c*b + r)/c;
     }
-    
+
     ai= av_mul_i(av_int2i(a), av_int2i(b));
     ai= av_add_i(ai, av_int2i(r));
-    
+
     return av_i2int(av_div_i(ai, av_int2i(c)));
 }
 

Index: rational.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavutil/rational.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- rational.c	1 Aug 2005 20:07:04 -0000	1.5
+++ rational.c	17 Dec 2005 18:14:37 -0000	1.6
@@ -17,7 +17,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  */
- 
+
 /**
  * @file rational.c
  * Rational numbers
@@ -26,7 +26,7 @@
 
 //#include <math.h>
 #include <limits.h>
- 
+
 #include "common.h"
 #include "mathematics.h"
 #include "rational.h"
@@ -42,7 +42,7 @@
         a1= (AVRational){nom, den};
         den=0;
     }
-    
+
     while(den){
         int64_t x       = nom / den;
         int64_t next_den= nom - den*x;
@@ -57,10 +57,10 @@
         den= next_den;
     }
     assert(ff_gcd(a1.num, a1.den) == 1);
-    
+
     *dst_nom = sign ? -a1.num : a1.num;
     *dst_den = a1.den;
-    
+
     return den==0;
 }
 

Index: rational.h
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavutil/rational.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- rational.h	1 Aug 2005 20:07:04 -0000	1.3
+++ rational.h	17 Dec 2005 18:14:37 -0000	1.4
@@ -17,7 +17,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  */
- 
+
 /**
  * @file rational.h
  * Rational numbers.

More information about the ffmpeg-cvslog mailing list