summaryrefslogtreecommitdiff
path: root/libavfilter/vf_yadif.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_yadif.c
parent1470ce21cec5ee26e106e2a884c26bbf84e5aaea (diff)
lavfi: add error handling to start_frame().
Diffstat (limited to 'libavfilter/vf_yadif.c')
-rw-r--r--libavfilter/vf_yadif.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/libavfilter/vf_yadif.c b/libavfilter/vf_yadif.c
index 02feeb213c..83bb4de222 100644
--- a/libavfilter/vf_yadif.c
+++ b/libavfilter/vf_yadif.c
@@ -201,7 +201,7 @@ static void return_frame(AVFilterContext *ctx, int is_second)
yadif->frame_pending = (yadif->mode&1) && !is_second;
}
-static void start_frame(AVFilterLink *link, AVFilterBufferRef *picref)
+static int start_frame(AVFilterLink *link, AVFilterBufferRef *picref)
{
AVFilterContext *ctx = link->dst;
YADIFContext *yadif = ctx->priv;
@@ -216,7 +216,7 @@ static void start_frame(AVFilterLink *link, AVFilterBufferRef *picref)
yadif->next = picref;
if (!yadif->cur)
- return;
+ return 0;
if (yadif->auto_enable && !yadif->cur->video->interlaced) {
yadif->out = avfilter_ref_buffer(yadif->cur, AV_PERM_READ);
@@ -224,8 +224,7 @@ static void start_frame(AVFilterLink *link, AVFilterBufferRef *picref)
yadif->prev = NULL;
if (yadif->out->pts != AV_NOPTS_VALUE)
yadif->out->pts *= 2;
- ff_start_frame(ctx->outputs[0], yadif->out);
- return;
+ return ff_start_frame(ctx->outputs[0], yadif->out);
}
if (!yadif->prev)
@@ -238,7 +237,7 @@ static void start_frame(AVFilterLink *link, AVFilterBufferRef *picref)
yadif->out->video->interlaced = 0;
if (yadif->out->pts != AV_NOPTS_VALUE)
yadif->out->pts *= 2;
- ff_start_frame(ctx->outputs[0], yadif->out);
+ return ff_start_frame(ctx->outputs[0], yadif->out);
}
static void end_frame(AVFilterLink *link)