summaryrefslogtreecommitdiff
path: root/libavfilter/vf_crop.c
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2012-07-14 09:25:33 +0200
committerAnton Khirnov <anton@khirnov.net>2012-07-22 09:14:05 +0200
commite9b992d035b58209d66115bd7d964741dd31d592 (patch)
tree6943fb7749c7930b1fde69fba8198d80a227f931 /libavfilter/vf_crop.c
parentebc8d974817fe456a0afe6867fdeb22c761fb04f (diff)
lavfi: add error handling to draw_slice().
Diffstat (limited to 'libavfilter/vf_crop.c')
-rw-r--r--libavfilter/vf_crop.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/libavfilter/vf_crop.c b/libavfilter/vf_crop.c
index 636e853259..f7d311a9a8 100644
--- a/libavfilter/vf_crop.c
+++ b/libavfilter/vf_crop.c
@@ -297,13 +297,13 @@ static int start_frame(AVFilterLink *link, AVFilterBufferRef *picref)
return ff_start_frame(link->dst->outputs[0], ref2);
}
-static void draw_slice(AVFilterLink *link, int y, int h, int slice_dir)
+static int draw_slice(AVFilterLink *link, int y, int h, int slice_dir)
{
AVFilterContext *ctx = link->dst;
CropContext *crop = ctx->priv;
if (y >= crop->y + crop->h || y + h <= crop->y)
- return;
+ return 0;
if (y < crop->y) {
h -= crop->y - y;
@@ -312,7 +312,7 @@ static void draw_slice(AVFilterLink *link, int y, int h, int slice_dir)
if (y + h > crop->y + crop->h)
h = crop->y + crop->h - y;
- ff_draw_slice(ctx->outputs[0], y - crop->y, h, slice_dir);
+ return ff_draw_slice(ctx->outputs[0], y - crop->y, h, slice_dir);
}
static void end_frame(AVFilterLink *link)