ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Thu Sep 4 03:49:10 2014 +0200| [bb8b752553f88e6285e8e4c7e15853eed865dc28] | committer: Michael Niedermayer
postproc: use FFMIN/FFMAX where appropriate Signed-off-by: Michael Niedermayer <michae...@gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bb8b752553f88e6285e8e4c7e15853eed865dc28 --- libpostproc/postprocess.c | 16 ++++++++-------- libpostproc/postprocess_template.c | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/libpostproc/postprocess.c b/libpostproc/postprocess.c index a557fb8..01ec0f9 100644 --- a/libpostproc/postprocess.c +++ b/libpostproc/postprocess.c @@ -318,13 +318,13 @@ static inline void doHorizDefFilter_C(uint8_t dst[], int stride, const PPContext if(q>0) { - d= d<0 ? 0 : d; - d= d>q ? q : d; + d = FFMAX(d, 0); + d = FFMIN(d, q); } else { - d= d>0 ? 0 : d; - d= d<q ? q : d; + d = FFMIN(d, 0); + d = FFMAX(d, q); } dst[3]-= d; @@ -515,11 +515,11 @@ static av_always_inline void do_a_deblock_C(uint8_t *src, int step, d*= FFSIGN(-middleEnergy); if(q>0){ - d= d<0 ? 0 : d; - d= d>q ? q : d; + d = FFMAX(d, 0); + d = FFMIN(d, q); }else{ - d= d>0 ? 0 : d; - d= d<q ? q : d; + d = FFMIN(d, 0); + d = FFMAX(d, q); } src[3*step]-= d; diff --git a/libpostproc/postprocess_template.c b/libpostproc/postprocess_template.c index 0761c50..10b91c3 100644 --- a/libpostproc/postprocess_template.c +++ b/libpostproc/postprocess_template.c @@ -1073,11 +1073,11 @@ static inline void RENAME(doVertDefFilter)(uint8_t src[], int stride, PPContext d*= FFSIGN(-middleEnergy); if(q>0){ - d= d<0 ? 0 : d; - d= d>q ? q : d; + d = FFMAX(d, 0); + d = FFMIN(d, q); }else{ - d= d>0 ? 0 : d; - d= d<q ? q : d; + d = FFMIN(d, 0); + d = FFMAX(d, q); } src[l4]-= d; _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
