Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer authored on 2014/09/04 10:49:10... | ... |
@@ -318,13 +318,13 @@ static inline void doHorizDefFilter_C(uint8_t dst[], int stride, const PPContext |
318 | 318 |
|
319 | 319 |
if(q>0) |
320 | 320 |
{ |
321 |
- d= d<0 ? 0 : d; |
|
322 |
- d= d>q ? q : d; |
|
321 |
+ d = FFMAX(d, 0); |
|
322 |
+ d = FFMIN(d, q); |
|
323 | 323 |
} |
324 | 324 |
else |
325 | 325 |
{ |
326 |
- d= d>0 ? 0 : d; |
|
327 |
- d= d<q ? q : d; |
|
326 |
+ d = FFMIN(d, 0); |
|
327 |
+ d = FFMAX(d, q); |
|
328 | 328 |
} |
329 | 329 |
|
330 | 330 |
dst[3]-= d; |
... | ... |
@@ -515,11 +515,11 @@ static av_always_inline void do_a_deblock_C(uint8_t *src, int step, |
515 | 515 |
d*= FFSIGN(-middleEnergy); |
516 | 516 |
|
517 | 517 |
if(q>0){ |
518 |
- d= d<0 ? 0 : d; |
|
519 |
- d= d>q ? q : d; |
|
518 |
+ d = FFMAX(d, 0); |
|
519 |
+ d = FFMIN(d, q); |
|
520 | 520 |
}else{ |
521 |
- d= d>0 ? 0 : d; |
|
522 |
- d= d<q ? q : d; |
|
521 |
+ d = FFMIN(d, 0); |
|
522 |
+ d = FFMAX(d, q); |
|
523 | 523 |
} |
524 | 524 |
|
525 | 525 |
src[3*step]-= d; |
... | ... |
@@ -1073,11 +1073,11 @@ static inline void RENAME(doVertDefFilter)(uint8_t src[], int stride, PPContext |
1073 | 1073 |
d*= FFSIGN(-middleEnergy); |
1074 | 1074 |
|
1075 | 1075 |
if(q>0){ |
1076 |
- d= d<0 ? 0 : d; |
|
1077 |
- d= d>q ? q : d; |
|
1076 |
+ d = FFMAX(d, 0); |
|
1077 |
+ d = FFMIN(d, q); |
|
1078 | 1078 |
}else{ |
1079 |
- d= d>0 ? 0 : d; |
|
1080 |
- d= d<q ? q : d; |
|
1079 |
+ d = FFMIN(d, 0); |
|
1080 |
+ d = FFMAX(d, q); |
|
1081 | 1081 |
} |
1082 | 1082 |
|
1083 | 1083 |
src[l4]-= d; |