diff options
| author | Stefano Sabatini <stefasab@gmail.com> | 2012-06-25 20:24:50 +0200 |
|---|---|---|
| committer | Stefano Sabatini <stefasab@gmail.com> | 2012-06-26 11:40:08 +0200 |
| commit | 8dd0e87d7b9b17d613c646c396c7b7c1a6293111 (patch) | |
| tree | 1bfab33ebed64db0f3442182504b0ad31cd0b760 /libavfilter | |
| parent | f054dbee6cc5195ba8f37823a494dab2d26e7cca (diff) | |
lavfi: remove old video sink API
It was deprecated since a long time and removed after the 2->3 major
bump.
Diffstat (limited to 'libavfilter')
| -rw-r--r-- | libavfilter/buffersink.h | 9 | ||||
| -rw-r--r-- | libavfilter/sink_buffer.c | 16 | ||||
| -rw-r--r-- | libavfilter/version.h | 3 |
3 files changed, 2 insertions, 26 deletions
diff --git a/libavfilter/buffersink.h b/libavfilter/buffersink.h index 97729bc7a9..93302e83c9 100644 --- a/libavfilter/buffersink.h +++ b/libavfilter/buffersink.h @@ -91,15 +91,6 @@ int av_buffersink_get_buffer_ref(AVFilterContext *buffer_sink, */ int av_buffersink_poll_frame(AVFilterContext *ctx); -#if FF_API_OLD_VSINK_API -/** - * @deprecated Use av_buffersink_get_buffer_ref() instead. - */ -attribute_deprecated -int av_vsink_buffer_get_video_buffer_ref(AVFilterContext *buffer_sink, - AVFilterBufferRef **picref, int flags); -#endif - /** * Get a buffer with filtered data from sink and put it in buf. * diff --git a/libavfilter/sink_buffer.c b/libavfilter/sink_buffer.c index c82bff0d76..b6410a23a6 100644 --- a/libavfilter/sink_buffer.c +++ b/libavfilter/sink_buffer.c @@ -161,32 +161,20 @@ int av_buffersink_poll_frame(AVFilterContext *ctx) return av_fifo_size(buf->fifo)/sizeof(AVFilterBufferRef *) + ff_poll_frame(inlink); } -#if FF_API_OLD_VSINK_API -int av_vsink_buffer_get_video_buffer_ref(AVFilterContext *ctx, - AVFilterBufferRef **picref, int flags) -{ - return av_buffersink_get_buffer_ref(ctx, picref, flags); -} -#endif - #if CONFIG_BUFFERSINK_FILTER static av_cold int vsink_init(AVFilterContext *ctx, const char *args, void *opaque) { BufferSinkContext *buf = ctx->priv; - av_unused AVBufferSinkParams *params; + AVBufferSinkParams *params = (AVBufferSinkParams *)opaque; if (!opaque) { av_log(ctx, AV_LOG_WARNING, "No opaque field provided\n"); buf->pixel_fmts = NULL; } else { -#if FF_API_OLD_VSINK_API - const int *pixel_fmts = (const enum PixelFormat *)opaque; -#else - params = (AVBufferSinkParams *)opaque; const int *pixel_fmts = params->pixel_fmts; -#endif + buf->pixel_fmts = ff_copy_int_list(pixel_fmts); if (!buf->pixel_fmts) return AVERROR(ENOMEM); diff --git a/libavfilter/version.h b/libavfilter/version.h index a3f6816ec2..d4d952b4b4 100644 --- a/libavfilter/version.h +++ b/libavfilter/version.h @@ -44,9 +44,6 @@ * Those FF_API_* defines are not part of public API. * They may change, break or disappear at any time. */ -#ifndef FF_API_OLD_VSINK_API -#define FF_API_OLD_VSINK_API (LIBAVFILTER_VERSION_MAJOR < 3) -#endif #ifndef FF_API_OLD_ALL_FORMATS_API #define FF_API_OLD_ALL_FORMATS_API (LIBAVFILTER_VERSION_MAJOR < 3) #endif |