summaryrefslogtreecommitdiff
path: root/libavfilter/vf_crop.c
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2012-07-08 17:29:42 +0200
committerAnton Khirnov <anton@khirnov.net>2012-07-22 09:14:04 +0200
commitebc8d974817fe456a0afe6867fdeb22c761fb04f (patch)
treed08864445a712ca289ef8a1b2a4fa4d7ff2e81e0 /libavfilter/vf_crop.c
parent1470ce21cec5ee26e106e2a884c26bbf84e5aaea (diff)
lavfi: add error handling to start_frame().
Diffstat (limited to 'libavfilter/vf_crop.c')
-rw-r--r--libavfilter/vf_crop.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/libavfilter/vf_crop.c b/libavfilter/vf_crop.c
index 14989f8259..636e853259 100644
--- a/libavfilter/vf_crop.c
+++ b/libavfilter/vf_crop.c
@@ -240,7 +240,7 @@ static int config_output(AVFilterLink *link)
return 0;
}
-static void start_frame(AVFilterLink *link, AVFilterBufferRef *picref)
+static int start_frame(AVFilterLink *link, AVFilterBufferRef *picref)
{
AVFilterContext *ctx = link->dst;
CropContext *crop = ctx->priv;
@@ -248,6 +248,9 @@ static void start_frame(AVFilterLink *link, AVFilterBufferRef *picref)
int i;
ref2 = avfilter_ref_buffer(picref, ~0);
+ if (!ref2)
+ return AVERROR(ENOMEM);
+
ref2->video->w = crop->w;
ref2->video->h = crop->h;
@@ -291,7 +294,7 @@ static void start_frame(AVFilterLink *link, AVFilterBufferRef *picref)
ref2->data[3] += crop->x * crop->max_step[3];
}
- ff_start_frame(link->dst->outputs[0], ref2);
+ return ff_start_frame(link->dst->outputs[0], ref2);
}
static void draw_slice(AVFilterLink *link, int y, int h, int slice_dir)