summaryrefslogtreecommitdiff
path: root/libavfilter/vf_overlay.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_overlay.c
parentebc8d974817fe456a0afe6867fdeb22c761fb04f (diff)
lavfi: add error handling to draw_slice().
Diffstat (limited to 'libavfilter/vf_overlay.c')
-rw-r--r--libavfilter/vf_overlay.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/libavfilter/vf_overlay.c b/libavfilter/vf_overlay.c
index 926e9a205c..2b9439c911 100644
--- a/libavfilter/vf_overlay.c
+++ b/libavfilter/vf_overlay.c
@@ -320,7 +320,7 @@ static void blend_slice(AVFilterContext *ctx,
}
}
-static void draw_slice(AVFilterLink *inlink, int y, int h, int slice_dir)
+static int draw_slice(AVFilterLink *inlink, int y, int h, int slice_dir)
{
AVFilterContext *ctx = inlink->dst;
AVFilterLink *outlink = ctx->outputs[0];
@@ -334,7 +334,7 @@ static void draw_slice(AVFilterLink *inlink, int y, int h, int slice_dir)
over->overpicref->video->w, over->overpicref->video->h,
y, outpicref->video->w, h);
}
- ff_draw_slice(outlink, y, h, slice_dir);
+ return ff_draw_slice(outlink, y, h, slice_dir);
}
static void end_frame(AVFilterLink *inlink)
@@ -342,7 +342,10 @@ static void end_frame(AVFilterLink *inlink)
ff_end_frame(inlink->dst->outputs[0]);
}
-static void null_draw_slice(AVFilterLink *inlink, int y, int h, int slice_dir) { }
+static int null_draw_slice(AVFilterLink *inlink, int y, int h, int slice_dir)
+{
+ return 0;
+}
static void null_end_frame(AVFilterLink *inlink) { }