diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2006-09-24 10:41:25 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2006-09-24 10:41:25 +0000 |
| commit | b8100438a0ed3bdd70837c5b55be6b50e22238b2 (patch) | |
| tree | 9b02b46caf3ae9ef0375b22ae043cb8969715067 | |
| parent | e6b120018b7fa8fed751b6c5eb6f872b49f1eddc (diff) | |
| download | ffmpeg-b8100438a0ed3bdd70837c5b55be6b50e22238b2.tar.gz | |
cosmetic
Originally committed as revision 6326 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/eval.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libavcodec/eval.c b/libavcodec/eval.c index 4ed178d635..ca17499f41 100644 --- a/libavcodec/eval.c +++ b/libavcodec/eval.c @@ -113,12 +113,12 @@ static double evalPrimary(Parser *p){ else if( strmatch(next, "squish") ) d= 1/(1+exp(4*d)); else if( strmatch(next, "gauss" ) ) d= exp(-d*d/2)/sqrt(2*M_PI); else if( strmatch(next, "abs" ) ) d= fabs(d); - else if( strmatch(next, "max" ) ) d= d > d2 ? d : d2; - else if( strmatch(next, "min" ) ) d= d < d2 ? d : d2; - else if( strmatch(next, "gt" ) ) d= d > d2 ? 1.0 : 0.0; - else if( strmatch(next, "gte" ) ) d= d >= d2 ? 1.0 : 0.0; - else if( strmatch(next, "lt" ) ) d= d > d2 ? 0.0 : 1.0; - else if( strmatch(next, "lte" ) ) d= d >= d2 ? 0.0 : 1.0; + else if( strmatch(next, "max" ) ) d= d > d2 ? d : d2; + else if( strmatch(next, "min" ) ) d= d < d2 ? d : d2; + else if( strmatch(next, "gt" ) ) d= d > d2 ? 1.0 : 0.0; + else if( strmatch(next, "gte" ) ) d= d >= d2 ? 1.0 : 0.0; + else if( strmatch(next, "lt" ) ) d= d > d2 ? 0.0 : 1.0; + else if( strmatch(next, "lte" ) ) d= d >= d2 ? 0.0 : 1.0; else if( strmatch(next, "eq" ) ) d= d == d2 ? 1.0 : 0.0; else if( strmatch(next, "(" ) ) d= d; // else if( strmatch(next, "l1" ) ) d= 1 + d2*(d - 1); |