aboutsummaryrefslogtreecommitdiffstats
path: root/libavutil
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2009-02-01 00:20:45 +0000
committerDiego Biurrun <diego@biurrun.de>2009-02-01 00:20:45 +0000
commit674bd4f691e865462d05c9e4da1b31800e14468b (patch)
treef9c270e0a4a3c1a21b4dcafab75b1902b8d7de42 /libavutil
parent7591b30499b10bd77a836737c2c7fcce1696f03d (diff)
downloadffmpeg-674bd4f691e865462d05c9e4da1b31800e14468b.tar.gz
cosmetics: Use 'num' instead of 'nom' as abbreviation for numerator.
Originally committed as revision 16910 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavutil')
-rw-r--r--libavutil/rational.c22
-rw-r--r--libavutil/rational.h8
2 files changed, 15 insertions, 15 deletions
diff --git a/libavutil/rational.c b/libavutil/rational.c
index 28d80e70f6..10343776d2 100644
--- a/libavutil/rational.c
+++ b/libavutil/rational.c
@@ -33,23 +33,23 @@
#include "mathematics.h"
#include "rational.h"
-int av_reduce(int *dst_nom, int *dst_den, int64_t nom, int64_t den, int64_t max){
+int av_reduce(int *dst_num, int *dst_den, int64_t num, int64_t den, int64_t max){
AVRational a0={0,1}, a1={1,0};
- int sign= (nom<0) ^ (den<0);
- int64_t gcd= av_gcd(FFABS(nom), FFABS(den));
+ int sign= (num<0) ^ (den<0);
+ int64_t gcd= av_gcd(FFABS(num), FFABS(den));
if(gcd){
- nom = FFABS(nom)/gcd;
+ num = FFABS(num)/gcd;
den = FFABS(den)/gcd;
}
- if(nom<=max && den<=max){
- a1= (AVRational){nom, den};
+ if(num<=max && den<=max){
+ a1= (AVRational){num, den};
den=0;
}
while(den){
- uint64_t x = nom / den;
- int64_t next_den= nom - den*x;
+ uint64_t x = num / den;
+ int64_t next_den= num - den*x;
int64_t a2n= x*a1.num + a0.num;
int64_t a2d= x*a1.den + a0.den;
@@ -57,19 +57,19 @@ int av_reduce(int *dst_nom, int *dst_den, int64_t nom, int64_t den, int64_t max)
if(a1.num) x= (max - a0.num) / a1.num;
if(a1.den) x= FFMIN(x, (max - a0.den) / a1.den);
- if (den*(2*x*a1.den + a0.den) > nom*a1.den)
+ if (den*(2*x*a1.den + a0.den) > num*a1.den)
a1 = (AVRational){x*a1.num + a0.num, x*a1.den + a0.den};
break;
}
a0= a1;
a1= (AVRational){a2n, a2d};
- nom= den;
+ num= den;
den= next_den;
}
assert(av_gcd(a1.num, a1.den) <= 1U);
- *dst_nom = sign ? -a1.num : a1.num;
+ *dst_num = sign ? -a1.num : a1.num;
*dst_den = a1.den;
return den==0;
diff --git a/libavutil/rational.h b/libavutil/rational.h
index 095e0e17ce..274595c6f3 100644
--- a/libavutil/rational.h
+++ b/libavutil/rational.h
@@ -64,14 +64,14 @@ static inline double av_q2d(AVRational a){
/**
* Reduces a fraction.
* This is useful for framerate calculations.
- * @param dst_nom destination numerator
+ * @param dst_num destination numerator
* @param dst_den destination denominator
- * @param nom source numerator
+ * @param num source numerator
* @param den source denominator
- * @param max the maximum allowed for dst_nom & dst_den
+ * @param max the maximum allowed for dst_num & dst_den
* @return 1 if exact, 0 otherwise
*/
-int av_reduce(int *dst_nom, int *dst_den, int64_t nom, int64_t den, int64_t max);
+int av_reduce(int *dst_num, int *dst_den, int64_t num, int64_t den, int64_t max);
/**
* Multiplies two rationals.