From f0250cc4636619fc00406f520a02c36efc24c5e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20B=C5=93sch?= <ubitux@gmail.com>
Date: Wed, 1 May 2013 14:46:00 +0200
Subject: [PATCH] lavfi/overlay: simpler up-rounded w/h computations.
---
libavfilter/vf_overlay.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/libavfilter/vf_overlay.c b/libavfilter/vf_overlay.c
index 1681979e864..6494bada3ca 100644
--- a/libavfilter/vf_overlay.c
+++ b/libavfilter/vf_overlay.c
@@ -478,10 +478,10 @@ static void blend_image(AVFilterContext *ctx,
for (i = 0; i < 3; i++) {
int hsub = i ? over->hsub : 0;
int vsub = i ? over->vsub : 0;
- int src_wp = FFALIGN(src_w, 1<<hsub) >> hsub;
- int src_hp = FFALIGN(src_h, 1<<vsub) >> vsub;
- int dst_wp = FFALIGN(dst_w, 1<<hsub) >> hsub;
- int dst_hp = FFALIGN(dst_h, 1<<vsub) >> vsub;
+ 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 yp = y>>vsub;
int xp = x>>hsub;
uint8_t *s, *sp, *d, *dp, *a, *ap;
--
GitLab