diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-17 00:49:32 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-17 00:49:32 +0100 |
| commit | 2bae7b337030de21c1a75cc300e4e54a0f142223 (patch) | |
| tree | e937e02c421b60dd77d146f0133bcc03b7d8d881 | |
| parent | f15c734be1650cee240cd65b0dbd31fe6993a5bc (diff) | |
| download | ffmpeg-2bae7b337030de21c1a75cc300e4e54a0f142223.tar.gz | |
avfilter/vf_fieldmatch: Add () to protect the arguments of the HAS_FF_AROUND() macro
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavfilter/vf_fieldmatch.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavfilter/vf_fieldmatch.c b/libavfilter/vf_fieldmatch.c index 358bd9ee5b..54fd16bee4 100644 --- a/libavfilter/vf_fieldmatch.c +++ b/libavfilter/vf_fieldmatch.c @@ -285,9 +285,9 @@ static int calc_combed_score(const FieldMatchContext *fm, const AVFrame *src) cmkpV += cmk_linesizeUV; cmkpU += cmk_linesizeUV; for (x = 1; x < width - 1; x++) { -#define HAS_FF_AROUND(p, lz) (p[x-1 - lz] == 0xff || p[x - lz] == 0xff || p[x+1 - lz] == 0xff || \ - p[x-1 ] == 0xff || p[x+1 ] == 0xff || \ - p[x-1 + lz] == 0xff || p[x + lz] == 0xff || p[x+1 + lz] == 0xff) +#define HAS_FF_AROUND(p, lz) (p[(x)-1 - (lz)] == 0xff || p[(x) - (lz)] == 0xff || p[(x)+1 - (lz)] == 0xff || \ + p[(x)-1 ] == 0xff || p[(x)+1 ] == 0xff || \ + p[(x)-1 + (lz)] == 0xff || p[(x) + (lz)] == 0xff || p[(x)+1 + (lz)] == 0xff) if ((cmkpV[x] == 0xff && HAS_FF_AROUND(cmkpV, cmk_linesizeUV)) || (cmkpU[x] == 0xff && HAS_FF_AROUND(cmkpU, cmk_linesizeUV))) { ((uint16_t*)cmkp)[x] = 0xffff; |