videolan
/
ffmpeg
mirror of https://git.videolan.org/git/ffmpeg.git
1
Fork 0
Code Releases Activity

Revert "yadif: add parens around macro parameters" 

This reverts commit 49e617f956.
This reduces the amount of non LGPL code, making a relicensing to LGPL
easier

Conflicts:

	libavfilter/vf_yadif.c

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-12-01 16:37:18 +01:00
parent 4ef4bb4a20
commit ab00800cde
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavfilter/vf_yadif.c
View File

@ -38,12 +38,12 @@ typedef struct ThreadData {
} ThreadData;
#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)]);\
{ 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]);\
if (score < spatial_score) {\
spatial_score= score;\
spatial_pred= (cur[mrefs +(j)] + cur[prefs -(j)])>>1;\
spatial_pred= (cur[mrefs + j] + cur[prefs - j])>>1;\
/* The is_not_edge argument here controls when the code will enter a branch
* which reads up to and including x-3 and x+3. */