diff options
Diffstat (limited to 'libavfilter/buffersink.c')
| -rw-r--r-- | libavfilter/buffersink.c | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/libavfilter/buffersink.c b/libavfilter/buffersink.c index c68b909d57..9a9aaf1d38 100644 --- a/libavfilter/buffersink.c +++ b/libavfilter/buffersink.c @@ -1,20 +1,20 @@ /* * Copyright (c) 2011 Stefano Sabatini * - * 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,14 +52,14 @@ static int start_frame(AVFilterLink *link, AVFilterBufferRef *buf) { BufferSinkContext *s = link->dst->priv; - av_assert0(!s->cur_buf); +// av_assert0(!s->cur_buf); s->cur_buf = buf; link->cur_buf = NULL; return 0; } -int av_buffersink_read(AVFilterContext *ctx, AVFilterBufferRef **buf) +int ff_buffersink_read_compat(AVFilterContext *ctx, AVFilterBufferRef **buf) { BufferSinkContext *s = ctx->priv; AVFilterLink *link = ctx->inputs[0]; @@ -100,8 +100,8 @@ static int read_from_fifo(AVFilterContext *ctx, AVFilterBufferRef **pbuf, } -int av_buffersink_read_samples(AVFilterContext *ctx, AVFilterBufferRef **pbuf, - int nb_samples) +int ff_buffersink_read_samples_compat(AVFilterContext *ctx, AVFilterBufferRef **pbuf, + int nb_samples) { BufferSinkContext *s = ctx->priv; AVFilterLink *link = ctx->inputs[0]; @@ -152,7 +152,11 @@ static const AVFilterPad avfilter_vsink_buffer_inputs[] = { }; AVFilter avfilter_vsink_buffer = { +#if AV_HAVE_INCOMPATIBLE_FORK_ABI .name = "buffersink", +#else + .name = "buffersink_old", +#endif .description = NULL_IF_CONFIG_SMALL("Buffer video frames, and make them available to the end of the filter graph."), .priv_size = sizeof(BufferSinkContext), .uninit = uninit, @@ -173,7 +177,11 @@ static const AVFilterPad avfilter_asink_abuffer_inputs[] = { }; AVFilter avfilter_asink_abuffer = { +#if AV_HAVE_INCOMPATIBLE_FORK_ABI .name = "abuffersink", +#else + .name = "abuffersink_old", +#endif .description = NULL_IF_CONFIG_SMALL("Buffer audio frames, and make them available to the end of the filter graph."), .priv_size = sizeof(BufferSinkContext), .uninit = uninit, |