mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2025-12-11 17:30:00 +01:00
avfilter/vf_xfade: Compute w2, h2 with float
Fixes: CID1458148 Result is not floating-point
Fixes: CID1458149 Result is not floating-point
Fixes: CID1458150 Result is not floating-point
Fixes: CID1458151 Result is not floating-point
Fixes: CID1458152 Result is not floating-point
Fixes: CID1458154 Result is not floating-point
Fixes: CID1458155 Result is not floating-point
Fixes: CID1458156 Result is not floating-point
Sponsored-by: Sovereign Tech Fund
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit b98125e5a5)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
@@ -914,7 +914,7 @@ static void vertopen##name##_transition(AVFilterContext *ctx,
|
||||
{ \
|
||||
XFadeContext *s = ctx->priv; \
|
||||
const int width = out->width; \
|
||||
const float w2 = out->width / 2; \
|
||||
const float w2 = out->width / 2.0; \
|
||||
\
|
||||
for (int y = slice_start; y < slice_end; y++) { \
|
||||
for (int x = 0; x < width; x++) { \
|
||||
@@ -941,7 +941,7 @@ static void vertclose##name##_transition(AVFilterContext *ctx,
|
||||
{ \
|
||||
XFadeContext *s = ctx->priv; \
|
||||
const int width = out->width; \
|
||||
const float w2 = out->width / 2; \
|
||||
const float w2 = out->width / 2.0; \
|
||||
\
|
||||
for (int y = slice_start; y < slice_end; y++) { \
|
||||
for (int x = 0; x < width; x++) { \
|
||||
@@ -968,7 +968,7 @@ static void horzopen##name##_transition(AVFilterContext *ctx,
|
||||
{ \
|
||||
XFadeContext *s = ctx->priv; \
|
||||
const int width = out->width; \
|
||||
const float h2 = out->height / 2; \
|
||||
const float h2 = out->height / 2.0; \
|
||||
\
|
||||
for (int y = slice_start; y < slice_end; y++) { \
|
||||
const float smooth = 2.f - fabsf((y - h2) / h2) - progress * 2.f; \
|
||||
@@ -995,7 +995,7 @@ static void horzclose##name##_transition(AVFilterContext *ctx,
|
||||
{ \
|
||||
XFadeContext *s = ctx->priv; \
|
||||
const int width = out->width; \
|
||||
const float h2 = out->height / 2; \
|
||||
const float h2 = out->height / 2.0; \
|
||||
\
|
||||
for (int y = slice_start; y < slice_end; y++) { \
|
||||
const float smooth = 1.f + fabsf((y - h2) / h2) - progress * 2.f; \
|
||||
|
||||
Reference in New Issue
Block a user