diff options
Diffstat (limited to 'libavfilter/vf_blend.c')
| -rw-r--r-- | libavfilter/vf_blend.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavfilter/vf_blend.c b/libavfilter/vf_blend.c index 7b5e51b..f2c4b84 100644 --- a/libavfilter/vf_blend.c +++ b/libavfilter/vf_blend.c @@ -241,7 +241,7 @@ DEFINE_BLEND8(lighten, FFMAX(A, B)) DEFINE_BLEND8(divide, av_clip_uint8(((float)A / ((float)B) * 255))) DEFINE_BLEND8(dodge, DODGE(A, B)) DEFINE_BLEND8(burn, BURN(A, B)) -DEFINE_BLEND8(softlight, (A > 127) ? B + (255 - B) * (A - 127.5) / 127.5 * (0.5 - FFABS(B - 127.5) / 255): B - B * ((127.5 - A) / 127.5) * (0.5 - FFABS(B - 127.5)/255)) +DEFINE_BLEND8(softlight, (A > 127) ? B + (255 - B) * (A - 127.5) / 127.5 * (0.5 - fabs(B - 127.5) / 255): B - B * ((127.5 - A) / 127.5) * (0.5 - fabs(B - 127.5)/255)) DEFINE_BLEND8(exclusion, A + B - 2 * A * B / 255) DEFINE_BLEND8(pinlight, (B < 128) ? FFMIN(A, 2 * B) : FFMAX(A, 2 * (B - 128))) DEFINE_BLEND8(phoenix, FFMIN(A, B) - FFMAX(A, B) + 255) @@ -280,7 +280,7 @@ DEFINE_BLEND16(lighten, FFMAX(A, B)) DEFINE_BLEND16(divide, av_clip_uint16(((float)A / ((float)B) * 65535))) DEFINE_BLEND16(dodge, DODGE(A, B)) DEFINE_BLEND16(burn, BURN(A, B)) -DEFINE_BLEND16(softlight, (A > 32767) ? B + (65535 - B) * (A - 32767.5) / 32767.5 * (0.5 - FFABS(B - 32767.5) / 65535): B - B * ((32767.5 - A) / 32767.5) * (0.5 - FFABS(B - 32767.5)/65535)) +DEFINE_BLEND16(softlight, (A > 32767) ? B + (65535 - B) * (A - 32767.5) / 32767.5 * (0.5 - fabs(B - 32767.5) / 65535): B - B * ((32767.5 - A) / 32767.5) * (0.5 - fabs(B - 32767.5)/65535)) DEFINE_BLEND16(exclusion, A + B - 2 * A * B / 65535) DEFINE_BLEND16(pinlight, (B < 32768) ? FFMIN(A, 2 * B) : FFMAX(A, 2 * (B - 32768))) DEFINE_BLEND16(phoenix, FFMIN(A, B) - FFMAX(A, B) + 65535) |
