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_overlay.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_overlay.c')
| -rw-r--r-- | libavfilter/vf_overlay.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavfilter/vf_overlay.c b/libavfilter/vf_overlay.c index 3eac7f0..37f19ea 100644 --- a/libavfilter/vf_overlay.c +++ b/libavfilter/vf_overlay.c @@ -520,10 +520,10 @@ static void blend_image(AVFilterContext *ctx, for (i = 0; i < 3; i++) { int hsub = i ? s->hsub : 0; int vsub = i ? s->vsub : 0; - int src_wp = FF_CEIL_RSHIFT(src_w, hsub); - int src_hp = FF_CEIL_RSHIFT(src_h, vsub); - int dst_wp = FF_CEIL_RSHIFT(dst_w, hsub); - int dst_hp = FF_CEIL_RSHIFT(dst_h, vsub); + int src_wp = AV_CEIL_RSHIFT(src_w, hsub); + int src_hp = AV_CEIL_RSHIFT(src_h, vsub); + int dst_wp = AV_CEIL_RSHIFT(dst_w, hsub); + int dst_hp = AV_CEIL_RSHIFT(dst_h, vsub); int yp = y>>vsub; int xp = x>>hsub; uint8_t *s, *sp, *d, *dp, *a, *ap; |
