diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-01-27 15:19:38 +0000 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-01-27 16:36:46 +0000 |
| commit | 21f946840260da150affd9a20cc35b3d56194ba6 (patch) | |
| tree | 5ca004c2ff6cf737f6858a56ce17602c339d80e6 /libavfilter/vf_lut.c | |
| parent | 0aada30510d809bccfd539a90ea37b61188f2cb4 (diff) | |
| download | ffmpeg-streaming-21f946840260da150affd9a20cc35b3d56194ba6.zip ffmpeg-streaming-21f946840260da150affd9a20cc35b3d56194ba6.tar.gz | |
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_lut.c')
| -rw-r--r-- | libavfilter/vf_lut.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavfilter/vf_lut.c b/libavfilter/vf_lut.c index 38a25fe..5148663 100644 --- a/libavfilter/vf_lut.c +++ b/libavfilter/vf_lut.c @@ -418,8 +418,8 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) for (plane = 0; plane < 4 && in->data[plane] && in->linesize[plane]; plane++) { int vsub = plane == 1 || plane == 2 ? s->vsub : 0; int hsub = plane == 1 || plane == 2 ? s->hsub : 0; - int h = FF_CEIL_RSHIFT(inlink->h, vsub); - int w = FF_CEIL_RSHIFT(inlink->w, hsub); + int h = AV_CEIL_RSHIFT(inlink->h, vsub); + int w = AV_CEIL_RSHIFT(inlink->w, hsub); const uint16_t *tab = s->lut[plane]; const int in_linesize = in->linesize[plane] / 2; const int out_linesize = out->linesize[plane] / 2; @@ -446,8 +446,8 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) for (plane = 0; plane < 4 && in->data[plane] && in->linesize[plane]; plane++) { int vsub = plane == 1 || plane == 2 ? s->vsub : 0; int hsub = plane == 1 || plane == 2 ? s->hsub : 0; - int h = FF_CEIL_RSHIFT(inlink->h, vsub); - int w = FF_CEIL_RSHIFT(inlink->w, hsub); + int h = AV_CEIL_RSHIFT(inlink->h, vsub); + int w = AV_CEIL_RSHIFT(inlink->w, hsub); const uint16_t *tab = s->lut[plane]; const int in_linesize = in->linesize[plane]; const int out_linesize = out->linesize[plane]; |
