diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-10-03 21:49:42 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-10-03 21:59:24 +0200 |
| commit | fd9a528523d020764044dcc5a4873d030eeb2b63 (patch) | |
| tree | 4fc2df02e9f5543ae30b8dd51bbfdb18605df8bf /libavfilter/vf_blend.c | |
| parent | d89820002a7f939c8f4be7e2253bab7a482fc976 (diff) | |
avfilter/vf_blend: Fix argument types, fix segfault in asm
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavfilter/vf_blend.c')
| -rw-r--r-- | libavfilter/vf_blend.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavfilter/vf_blend.c b/libavfilter/vf_blend.c index b19eb6b1a2..8032de1685 100644 --- a/libavfilter/vf_blend.c +++ b/libavfilter/vf_blend.c @@ -120,7 +120,7 @@ AVFILTER_DEFINE_CLASS(blend); static void blend_normal(const uint8_t *top, ptrdiff_t top_linesize, const uint8_t *bottom, ptrdiff_t bottom_linesize, uint8_t *dst, ptrdiff_t dst_linesize, - int width, int start, int end, + ptrdiff_t width, ptrdiff_t start, ptrdiff_t end, FilterParams *param, double *values) { av_image_copy_plane(dst, dst_linesize, top, top_linesize, width, end - start); @@ -130,7 +130,7 @@ static void blend_normal(const uint8_t *top, ptrdiff_t top_linesize, static void blend_## name##_8bit(const uint8_t *top, ptrdiff_t top_linesize, \ const uint8_t *bottom, ptrdiff_t bottom_linesize, \ uint8_t *dst, ptrdiff_t dst_linesize, \ - int width, int start, int end, \ + ptrdiff_t width, ptrdiff_t start, ptrdiff_t end, \ FilterParams *param, double *values) \ { \ double opacity = param->opacity; \ @@ -150,7 +150,7 @@ static void blend_## name##_8bit(const uint8_t *top, ptrdiff_t top_linesize, static void blend_## name##_16bit(const uint8_t *_top, ptrdiff_t top_linesize, \ const uint8_t *_bottom, ptrdiff_t bottom_linesize, \ uint8_t *_dst, ptrdiff_t dst_linesize, \ - int width, int start, int end, \ + ptrdiff_t width, ptrdiff_t start, ptrdiff_t end, \ FilterParams *param, double *values) \ { \ const uint16_t *top = (uint16_t*)_top; \ @@ -252,7 +252,7 @@ DEFINE_BLEND16(linearlight,av_clip_uint16((B < 32768) ? B + 2 * A - 65535 : B + static void blend_expr_## name(const uint8_t *_top, ptrdiff_t top_linesize, \ const uint8_t *_bottom, ptrdiff_t bottom_linesize, \ uint8_t *_dst, ptrdiff_t dst_linesize, \ - int width, int start, int end, \ + ptrdiff_t width, ptrdiff_t start, ptrdiff_t end, \ FilterParams *param, double *values) \ { \ const type *top = (type*)_top; \ |