vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Sun Mar 3 17:25:33 2019 +0200| [cb706b4999a13d331ca22072fd3b0d3e772ae983] | committer: Rémi Denis-Courmont
yadif: fix variable shadowing > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=cb706b4999a13d331ca22072fd3b0d3e772ae983 --- modules/video_filter/deinterlace/yadif.h | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/modules/video_filter/deinterlace/yadif.h b/modules/video_filter/deinterlace/yadif.h index bb07d9c1b5..f520c20252 100644 --- a/modules/video_filter/deinterlace/yadif.h +++ b/modules/video_filter/deinterlace/yadif.h @@ -25,9 +25,9 @@ #define FFABS abs #define CHECK(j)\ - { int score = FFABS(cur[mrefs-1+(j)] - cur[prefs-1-(j)])\ - + FFABS(cur[mrefs +(j)] - cur[prefs -(j)])\ - + FFABS(cur[mrefs+1+(j)] - cur[prefs+1-(j)]);\ + score = FFABS(cur[mrefs-1+(j)] - cur[prefs-1-(j)])\ + + FFABS(cur[mrefs +(j)] - cur[prefs -(j)])\ + + FFABS(cur[mrefs+1+(j)] - cur[prefs+1-(j)]);\ if (score < spatial_score) {\ spatial_score= score;\ spatial_pred= (cur[mrefs +(j)] + cur[prefs -(j)])>>1;\ @@ -44,9 +44,10 @@ int spatial_pred = (c+e)>>1; \ int spatial_score = FFABS(cur[mrefs-1] - cur[prefs-1]) + FFABS(c-e) \ + FFABS(cur[mrefs+1] - cur[prefs+1]) - 1; \ + int score; \ \ - CHECK(-1) CHECK(-2) }} }} \ - CHECK( 1) CHECK( 2) }} }} \ + CHECK(-1) CHECK(-2) }} \ + CHECK( 1) CHECK( 2) }} \ \ if (mode < 2) { \ int b = (prev2[2*mrefs] + next2[2*mrefs])>>1; \ _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
