diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-01-27 18:19:38 +0300 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-01-27 19:36:46 +0300 |
| commit | 21f946840260da150affd9a20cc35b3d56194ba6 (patch) | |
| tree | 5ca004c2ff6cf737f6858a56ce17602c339d80e6 /libavfilter/vf_delogo.c | |
| parent | 0aada30510d809bccfd539a90ea37b61188f2cb4 (diff) | |
avutil: Rename FF_CEIL_COMPAT to AV_CEIL_COMPAT
Libav, for some reason, merged this as a public API function. This will
aid in future merges.
A define is left for backwards compat, just in case some person
used it, since it is in a public header.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavfilter/vf_delogo.c')
| -rw-r--r-- | libavfilter/vf_delogo.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavfilter/vf_delogo.c b/libavfilter/vf_delogo.c index 118caa649f..63c3539467 100644 --- a/libavfilter/vf_delogo.c +++ b/libavfilter/vf_delogo.c @@ -262,13 +262,13 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) apply_delogo(out->data[plane], out->linesize[plane], in ->data[plane], in ->linesize[plane], - FF_CEIL_RSHIFT(inlink->w, hsub), - FF_CEIL_RSHIFT(inlink->h, vsub), + AV_CEIL_RSHIFT(inlink->w, hsub), + AV_CEIL_RSHIFT(inlink->h, vsub), sar, s->x>>hsub, s->y>>vsub, /* Up and left borders were rounded down, inject lost bits * into width and height to avoid error accumulation */ - FF_CEIL_RSHIFT(s->w + (s->x & ((1<<hsub)-1)), hsub), - FF_CEIL_RSHIFT(s->h + (s->y & ((1<<vsub)-1)), vsub), + AV_CEIL_RSHIFT(s->w + (s->x & ((1<<hsub)-1)), hsub), + AV_CEIL_RSHIFT(s->h + (s->y & ((1<<vsub)-1)), vsub), s->band>>FFMIN(hsub, vsub), s->show, direct); } |