diff options
Diffstat (limited to 'libavfilter/split.c')
-rw-r--r-- | libavfilter/split.c | 27 |
1 files changed, 18 insertions, 9 deletions
diff --git a/libavfilter/split.c b/libavfilter/split.c index 01bb448..30cc3e5 100644 --- a/libavfilter/split.c +++ b/libavfilter/split.c @@ -1,20 +1,20 @@ /* * Copyright (c) 2007 Bobby Bingham * - * This file is part of Libav. + * This file is part of FFmpeg. * - * Libav is free software; you can redistribute it and/or + * FFmpeg is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * - * Libav is distributed in the hope that it will be useful, + * FFmpeg is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with Libav; if not, write to the Free Software + * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -52,6 +52,7 @@ static int split_init(AVFilterContext *ctx, const char *args) snprintf(name, sizeof(name), "output%d", i); pad.type = ctx->filter->inputs[0].type; pad.name = av_strdup(name); + pad.rej_perms = AV_PERM_WRITE; ff_insert_outpad(ctx, i, &pad); } @@ -70,10 +71,14 @@ static void split_uninit(AVFilterContext *ctx) static int start_frame(AVFilterLink *inlink, AVFilterBufferRef *picref) { AVFilterContext *ctx = inlink->dst; - int i, ret = 0; + int i, ret = AVERROR_EOF; for (i = 0; i < ctx->nb_outputs; i++) { - AVFilterBufferRef *buf_out = avfilter_ref_buffer(picref, ~AV_PERM_WRITE); + AVFilterBufferRef *buf_out; + + if (ctx->outputs[i]->closed) + continue; + buf_out = avfilter_ref_buffer(picref, ~AV_PERM_WRITE); if (!buf_out) return AVERROR(ENOMEM); @@ -87,9 +92,11 @@ static int start_frame(AVFilterLink *inlink, AVFilterBufferRef *picref) static int draw_slice(AVFilterLink *inlink, int y, int h, int slice_dir) { AVFilterContext *ctx = inlink->dst; - int i, ret = 0; + int i, ret = AVERROR_EOF; for (i = 0; i < ctx->nb_outputs; i++) { + if (ctx->outputs[i]->closed) + continue; ret = ff_draw_slice(ctx->outputs[i], y, h, slice_dir); if (ret < 0) break; @@ -100,9 +107,11 @@ static int draw_slice(AVFilterLink *inlink, int y, int h, int slice_dir) static int end_frame(AVFilterLink *inlink) { AVFilterContext *ctx = inlink->dst; - int i, ret = 0; + int i, ret = AVERROR_EOF; for (i = 0; i < ctx->nb_outputs; i++) { + if (ctx->outputs[i]->closed) + continue; ret = ff_end_frame(ctx->outputs[i]); if (ret < 0) break; @@ -124,7 +133,7 @@ static const AVFilterPad avfilter_vf_split_inputs[] = { AVFilter avfilter_vf_split = { .name = "split", - .description = NULL_IF_CONFIG_SMALL("Pass on the input to two outputs."), + .description = NULL_IF_CONFIG_SMALL("Pass on the input video to N outputs."), .init = split_init, .uninit = split_uninit, |