From 5e88b96f37d7eb7d435b6334d99aa067da8a0cb5 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Sun, 17 Jun 2012 12:36:52 +0200 Subject: lavfi: remove disabled FF_API_DEFAULT_CONFIG_OUTPUT_LINK cruft --- libavfilter/avfilter.c | 6 ------ libavfilter/avfilter.h | 6 ------ libavfilter/version.h | 3 --- 3 files changed, 15 deletions(-) diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index c30b057..fa31d09 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -443,12 +443,6 @@ enum AVMediaType avfilter_pad_get_type(AVFilterPad *pads, int pad_idx) return pads[pad_idx].type; } -#if FF_API_DEFAULT_CONFIG_OUTPUT_LINK -int avfilter_default_config_output_link(AVFilterLink *link) -{ - return 0; -} -#endif #if FF_API_FILTERS_PUBLIC void avfilter_insert_pad(unsigned idx, unsigned *count, size_t padidx_off, AVFilterPad **pads, AVFilterLink ***links, diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h index 5507a60..319e021 100644 --- a/libavfilter/avfilter.h +++ b/libavfilter/avfilter.h @@ -409,12 +409,6 @@ void avfilter_default_draw_slice(AVFilterLink *link, int y, int h, int slice_dir attribute_deprecated void avfilter_default_end_frame(AVFilterLink *link); -#if FF_API_DEFAULT_CONFIG_OUTPUT_LINK -/** default handler for config_props() for audio/video outputs */ -attribute_deprecated -int avfilter_default_config_output_link(AVFilterLink *link); -#endif - /** default handler for get_video_buffer() for video inputs */ attribute_deprecated AVFilterBufferRef *avfilter_default_get_video_buffer(AVFilterLink *link, diff --git a/libavfilter/version.h b/libavfilter/version.h index d61d111..f5a0982 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_DEFAULT_CONFIG_OUTPUT_LINK -#define FF_API_DEFAULT_CONFIG_OUTPUT_LINK (LIBAVFILTER_VERSION_MAJOR < 3) -#endif #ifndef FF_API_FILTERS_PUBLIC #define FF_API_FILTERS_PUBLIC (LIBAVFILTER_VERSION_MAJOR < 3) #endif -- cgit v1.1