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_spp.c | |
| parent | 0aada30510d809bccfd539a90ea37b61188f2cb4 (diff) | |
| download | ffmpeg-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_spp.c')
| -rw-r--r-- | libavfilter/vf_spp.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavfilter/vf_spp.c b/libavfilter/vf_spp.c index 11954542bb..fe579cedb1 100644 --- a/libavfilter/vf_spp.c +++ b/libavfilter/vf_spp.c @@ -374,11 +374,11 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) /* if the qp stride is not set, it means the QP are only defined on * a line basis */ if (!qp_stride) { - w = FF_CEIL_RSHIFT(inlink->w, 4); + w = AV_CEIL_RSHIFT(inlink->w, 4); h = 1; } else { w = qp_stride; - h = FF_CEIL_RSHIFT(inlink->h, 4); + h = AV_CEIL_RSHIFT(inlink->h, 4); } if (w * h > s->non_b_qp_alloc_size) { @@ -400,8 +400,8 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) qp_table = s->non_b_qp_table; if (qp_table || s->qp) { - const int cw = FF_CEIL_RSHIFT(inlink->w, s->hsub); - const int ch = FF_CEIL_RSHIFT(inlink->h, s->vsub); + const int cw = AV_CEIL_RSHIFT(inlink->w, s->hsub); + const int ch = AV_CEIL_RSHIFT(inlink->h, s->vsub); /* get a new frame if in-place is not possible or if the dimensions * are not multiple of 8 */ |