diff options
author | Vittorio Giovara <vittorio.giovara@gmail.com> | 2015-07-28 14:30:21 +0100 |
---|---|---|
committer | Vittorio Giovara <vittorio.giovara@gmail.com> | 2015-08-28 16:01:16 +0200 |
commit | f6974fe651d29ef6eb68d66d73f7b6c011062aa0 (patch) | |
tree | 37a9f0b2d74680e99ac1d3ad3abe8f5b860d36b9 /libavfilter/buffersink.c | |
parent | e65e4cbbda03ca3c9087f069c9867d518415fca1 (diff) | |
download | ffmpeg-streaming-f6974fe651d29ef6eb68d66d73f7b6c011062aa0.zip ffmpeg-streaming-f6974fe651d29ef6eb68d66d73f7b6c011062aa0.tar.gz |
lavfi: Drop deprecated AVFilterBuffer* code
Deprecated in 11/2012.
Diffstat (limited to 'libavfilter/buffersink.c')
-rw-r--r-- | libavfilter/buffersink.c | 74 |
1 files changed, 0 insertions, 74 deletions
diff --git a/libavfilter/buffersink.c b/libavfilter/buffersink.c index 2894a5b..3b4d285 100644 --- a/libavfilter/buffersink.c +++ b/libavfilter/buffersink.c @@ -137,80 +137,6 @@ int attribute_align_arg av_buffersink_get_samples(AVFilterContext *ctx, return ret; } -#if FF_API_AVFILTERBUFFER -FF_DISABLE_DEPRECATION_WARNINGS -static void compat_free_buffer(AVFilterBuffer *buf) -{ - AVFrame *frame = buf->priv; - av_frame_free(&frame); - av_free(buf); -} - -static int compat_read(AVFilterContext *ctx, - AVFilterBufferRef **pbuf, int nb_samples) -{ - AVFilterBufferRef *buf; - AVFrame *frame; - int ret; - - if (!pbuf) - return ff_poll_frame(ctx->inputs[0]); - - frame = av_frame_alloc(); - if (!frame) - return AVERROR(ENOMEM); - - if (!nb_samples) - ret = av_buffersink_get_frame(ctx, frame); - else - ret = av_buffersink_get_samples(ctx, frame, nb_samples); - - if (ret < 0) - goto fail; - - if (ctx->inputs[0]->type == AVMEDIA_TYPE_VIDEO) { - buf = avfilter_get_video_buffer_ref_from_arrays(frame->data, frame->linesize, - AV_PERM_READ, - frame->width, frame->height, - frame->format); - } else { - buf = avfilter_get_audio_buffer_ref_from_arrays(frame->extended_data, - frame->linesize[0], AV_PERM_READ, - frame->nb_samples, - frame->format, - frame->channel_layout); - } - if (!buf) { - ret = AVERROR(ENOMEM); - goto fail; - } - - avfilter_copy_frame_props(buf, frame); - - buf->buf->priv = frame; - buf->buf->free = compat_free_buffer; - - *pbuf = buf; - - return 0; -fail: - av_frame_free(&frame); - return ret; -} - -int attribute_align_arg av_buffersink_read(AVFilterContext *ctx, AVFilterBufferRef **buf) -{ - return compat_read(ctx, buf, 0); -} - -int attribute_align_arg av_buffersink_read_samples(AVFilterContext *ctx, AVFilterBufferRef **buf, - int nb_samples) -{ - return compat_read(ctx, buf, nb_samples); -} -FF_ENABLE_DEPRECATION_WARNINGS -#endif - static const AVFilterPad avfilter_vsink_buffer_inputs[] = { { .name = "default", |