aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-11-01 00:41:46 +0100
committerMichael Niedermayer <michaelni@gmx.at>2012-11-04 01:30:16 +0100
commit4a2599b0e6b8a7076c9141d863d49667b089a45c (patch)
treed030a2087360bc9b6a5bbb5f1a7ff3e5a433ecea
parent5f531386210e844f0a6819404cde58da54c46a00 (diff)
downloadffmpeg-4a2599b0e6b8a7076c9141d863d49667b089a45c.tar.gz
transform: give avfilter_transform() a return value for returning an error
Fixes CID703674 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavfilter/transform.c5
-rw-r--r--libavfilter/transform.h3
2 files changed, 6 insertions, 2 deletions
diff --git a/libavfilter/transform.c b/libavfilter/transform.c
index b3f85ddd8c..1db8c0836d 100644
--- a/libavfilter/transform.c
+++ b/libavfilter/transform.c
@@ -146,7 +146,7 @@ static inline int mirror(int v, int m)
return v;
}
-void avfilter_transform(const uint8_t *src, uint8_t *dst,
+int avfilter_transform(const uint8_t *src, uint8_t *dst,
int src_stride, int dst_stride,
int width, int height, const float *matrix,
enum InterpolateMethod interpolate,
@@ -167,6 +167,8 @@ void avfilter_transform(const uint8_t *src, uint8_t *dst,
case INTERPOLATE_BIQUADRATIC:
func = interpolate_biquadratic;
break;
+ default:
+ return AVERROR(EINVAL);
}
for (y = 0; y < height; y++) {
@@ -195,5 +197,6 @@ void avfilter_transform(const uint8_t *src, uint8_t *dst,
dst[y * dst_stride + x] = func(x_s, y_s, src, width, height, src_stride, def);
}
}
+ return 0;
}
diff --git a/libavfilter/transform.h b/libavfilter/transform.h
index edd0cf21fd..07436bfccb 100644
--- a/libavfilter/transform.h
+++ b/libavfilter/transform.h
@@ -116,8 +116,9 @@ void avfilter_mul_matrix(const float *m1, float scalar, float *result);
* @param matrix 9-item affine transformation matrix
* @param interpolate pixel interpolation method
* @param fill edge fill method
+ * @return negative on error
*/
-void avfilter_transform(const uint8_t *src, uint8_t *dst,
+int avfilter_transform(const uint8_t *src, uint8_t *dst,
int src_stride, int dst_stride,
int width, int height, const float *matrix,
enum InterpolateMethod interpolate,