X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavfilter%2Ftransform.c;h=f4f9e0a47d9fa6f3e9f92ae3e678449877907011;hb=339af976b6fd9c05d1e75e75a5323efdb3d6afa1;hp=f92fc4d42fb87f66a0f970966b4989453d21ab36;hpb=94d98330ed6c5562341315c26c1af92771a2e6de;p=ffmpeg diff --git a/libavfilter/transform.c b/libavfilter/transform.c index f92fc4d42fb..f4f9e0a47d9 100644 --- a/libavfilter/transform.c +++ b/libavfilter/transform.c @@ -103,12 +103,19 @@ INTERPOLATE_METHOD(interpolate_biquadratic) } } -void avfilter_get_matrix(float x_shift, float y_shift, float angle, float zoom, float *matrix) { - matrix[0] = zoom * cos(angle); +void ff_get_matrix( + float x_shift, + float y_shift, + float angle, + float scale_x, + float scale_y, + float *matrix +) { + matrix[0] = scale_x * cos(angle); matrix[1] = -sin(angle); matrix[2] = x_shift; matrix[3] = -matrix[1]; - matrix[4] = matrix[0]; + matrix[4] = scale_y * cos(angle); matrix[5] = y_shift; matrix[6] = 0; matrix[7] = 0;