From 88c3b87bd81829d1b7171cb26e5ef5a564dbd96a Mon Sep 17 00:00:00 2001 From: Mina Nagy Zaki Date: Thu, 4 Aug 2011 15:47:00 +0300 Subject: lavfi: deprecate default config_props() callback and refactor avfilter_config_links() Link properties have to be checked after config_props() is called to make sure everything is sane, so the default config_props() for output links was redundant. Remove now empty defaults.c Signed-off-by: Anton Khirnov --- libavfilter/avfilter.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'libavfilter/avfilter.h') diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h index 718f77d..711feca 100644 --- a/libavfilter/avfilter.h +++ b/libavfilter/avfilter.h @@ -460,8 +460,11 @@ void avfilter_default_draw_slice(AVFilterLink *link, int y, int h, int slice_dir /** default handler for end_frame() for video inputs */ 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 */ AVFilterBufferRef *avfilter_default_get_video_buffer(AVFilterLink *link, -- cgit v1.1 From 43c7a01e9879640859d32b062ac01700e1333c7a Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Sat, 19 May 2012 10:37:56 +0200 Subject: lavfi: remove avfilter_default_* from public API on next bump. Those functions are only useful inside filters. It is better to not support user filters until the API is more stable. --- libavfilter/avfilter.h | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'libavfilter/avfilter.h') diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h index 711feca..0d40b76 100644 --- a/libavfilter/avfilter.h +++ b/libavfilter/avfilter.h @@ -451,13 +451,17 @@ struct AVFilterPad { int (*config_props)(AVFilterLink *link); }; +#if FF_API_FILTERS_PUBLIC /** default handler for start_frame() for video inputs */ +attribute_deprecated void avfilter_default_start_frame(AVFilterLink *link, AVFilterBufferRef *picref); /** default handler for draw_slice() for video inputs */ +attribute_deprecated void avfilter_default_draw_slice(AVFilterLink *link, int y, int h, int slice_dir); /** default handler for end_frame() for video inputs */ +attribute_deprecated void avfilter_default_end_frame(AVFilterLink *link); #if FF_API_DEFAULT_CONFIG_OUTPUT_LINK @@ -467,9 +471,15 @@ 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, int perms, int w, int h); +/** Default handler for query_formats() */ +attribute_deprecated +int avfilter_default_query_formats(AVFilterContext *ctx); +#endif + /** * A helper for query_formats() which sets all links to the same list of * formats. If there are no links hooked to this filter, the list of formats is @@ -477,9 +487,6 @@ AVFilterBufferRef *avfilter_default_get_video_buffer(AVFilterLink *link, */ void avfilter_set_common_formats(AVFilterContext *ctx, AVFilterFormats *formats); -/** Default handler for query_formats() */ -int avfilter_default_query_formats(AVFilterContext *ctx); - /** start_frame() handler for filters which simply pass video along */ void avfilter_null_start_frame(AVFilterLink *link, AVFilterBufferRef *picref); -- cgit v1.1 From c04c533f62b80e9d6bbcb89946bab6206a8873c5 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Sat, 19 May 2012 10:37:56 +0200 Subject: lavfi: remove avfilter_null_* from public API on next bump. Those functions are only useful inside filters. It is better to not support user filters until the API is more stable. --- libavfilter/avfilter.h | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'libavfilter/avfilter.h') diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h index 0d40b76..54adc5c 100644 --- a/libavfilter/avfilter.h +++ b/libavfilter/avfilter.h @@ -487,18 +487,24 @@ int avfilter_default_query_formats(AVFilterContext *ctx); */ void avfilter_set_common_formats(AVFilterContext *ctx, AVFilterFormats *formats); +#if FF_API_FILTERS_PUBLIC /** start_frame() handler for filters which simply pass video along */ +attribute_deprecated void avfilter_null_start_frame(AVFilterLink *link, AVFilterBufferRef *picref); /** draw_slice() handler for filters which simply pass video along */ +attribute_deprecated void avfilter_null_draw_slice(AVFilterLink *link, int y, int h, int slice_dir); /** end_frame() handler for filters which simply pass video along */ +attribute_deprecated void avfilter_null_end_frame(AVFilterLink *link); /** get_video_buffer() handler for filters which simply pass video along */ +attribute_deprecated AVFilterBufferRef *avfilter_null_get_video_buffer(AVFilterLink *link, int perms, int w, int h); +#endif /** * Filter definition. This defines the pads a filter contains, and all the -- cgit v1.1 From ce353a881fe305d4e6f046d6f36f2071449ca57b Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Mon, 21 May 2012 19:30:07 +0200 Subject: lavfi: fix incorrect comment. poll_frame()/request_frame() are used for audio too. --- libavfilter/avfilter.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libavfilter/avfilter.h') diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h index 54adc5c..3483569 100644 --- a/libavfilter/avfilter.h +++ b/libavfilter/avfilter.h @@ -421,7 +421,7 @@ struct AVFilterPad { * * Defaults to just calling the source poll_frame() method. * - * Output video pads only. + * Output pads only. */ int (*poll_frame)(AVFilterLink *link); @@ -430,7 +430,7 @@ struct AVFilterPad { * frame being output over the given link. This should return zero on * success, and another value on error. * - * Output video pads only. + * Output pads only. */ int (*request_frame)(AVFilterLink *link); -- cgit v1.1 From 0ce4a627c9b8bcd2c23d05ada3e4858684cb8127 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Mon, 21 May 2012 19:33:35 +0200 Subject: lavfi: fix comment, audio is supported now. --- libavfilter/avfilter.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'libavfilter/avfilter.h') diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h index 3483569..289c06c 100644 --- a/libavfilter/avfilter.h +++ b/libavfilter/avfilter.h @@ -338,8 +338,7 @@ struct AVFilterPad { const char *name; /** - * AVFilterPad type. Only video supported now, hopefully someone will - * add audio in the future. + * AVFilterPad type. */ enum AVMediaType type; -- cgit v1.1