Permalink
Browse files

transform: give avfilter_transform() a return value for returning an …

…error

Fixes CID703674
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
  • Loading branch information...
1 parent 5f53138 commit 4a2599b0e6b8a7076c9141d863d49667b089a45c @michaelni michaelni committed Oct 31, 2012
Showing with 6 additions and 2 deletions.
  1. +4 −1 libavfilter/transform.c
  2. +2 −1 libavfilter/transform.h
View
@@ -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;
}
View
@@ -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,

0 comments on commit 4a2599b

Please sign in to comment.