lavfi: remove disabled FF_API_DEFAULT_CONFIG_OUTPUT_LINK cruft
authorAnton Khirnov <anton@khirnov.net>
Sun, 17 Jun 2012 10:36:52 +0000 (12:36 +0200)
committerAnton Khirnov <anton@khirnov.net>
Tue, 26 Jun 2012 11:18:44 +0000 (13:18 +0200)
libavfilter/avfilter.c
libavfilter/avfilter.h
libavfilter/version.h

index c30b057..fa31d09 100644 (file)
@@ -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,
index 5507a60..319e021 100644 (file)
@@ -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,
index d61d111..f5a0982 100644 (file)
@@ -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