diff options
Diffstat (limited to 'video/filter')
-rw-r--r-- | video/filter/vf_vavpp.c | 4 | ||||
-rw-r--r-- | video/filter/vf_yadif.c | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/video/filter/vf_vavpp.c b/video/filter/vf_vavpp.c index 62dd9a77a0..f9f77a1b64 100644 --- a/video/filter/vf_vavpp.c +++ b/video/filter/vf_vavpp.c @@ -342,8 +342,8 @@ static bool initialize(struct vf_priv_s *p) if (!num) continue; VAProcDeinterlacingType algorithm = VAProcDeinterlacingBob; - for (int i=0; i<num; ++i) { // find Bob - if (caps[i].type != algorithm) + for (int n=0; n < num; n++) { // find Bob + if (caps[n].type != algorithm) continue; VAProcFilterParameterBufferDeinterlacing param; param.type = VAProcFilterDeinterlacing; diff --git a/video/filter/vf_yadif.c b/video/filter/vf_yadif.c index b9a48c6da2..b53b1bf594 100644 --- a/video/filter/vf_yadif.c +++ b/video/filter/vf_yadif.c @@ -311,16 +311,16 @@ static void filter_line_c(struct vf_priv_s *p, uint8_t *dst, uint8_t *prev, uint int spatial_score= FFABS(cur[-refs-1] - cur[+refs-1]) + FFABS(c-e) + FFABS(cur[-refs+1] - cur[+refs+1]) - 1; -#define CHECK(j)\ - { int score= FFABS(cur[-refs-1+j] - cur[+refs-1-j])\ +#define CHECK(x, j)\ + { int score##x= FFABS(cur[-refs-1+j] - cur[+refs-1-j])\ + FFABS(cur[-refs +j] - cur[+refs -j])\ + FFABS(cur[-refs+1+j] - cur[+refs+1-j]);\ - if(score < spatial_score){\ - spatial_score= score;\ + if(score##x < spatial_score){\ + spatial_score= score##x;\ spatial_pred= (cur[-refs +j] + cur[+refs -j])>>1;\ - CHECK(-1) CHECK(-2) }} }} - CHECK( 1) CHECK( 2) }} }} + CHECK(0, -1) CHECK(1, -2) }} }} + CHECK(0, 1) CHECK(1, 2) }} }} if(p->mode<2){ int b= (prev2[-2*refs] + next2[-2*refs])>>1; |