From a4cb0af94582aa7598db95bba4bc92f1b349dfe3 Mon Sep 17 00:00:00 2001 From: Stefano Sabatini Date: Fri, 7 Sep 2012 11:21:06 +0200 Subject: [PATCH] lavfi: drop deprecated and pointless avfilter_default_end_frame() function Fix warning when compiling boxblur. While this is technically a major API break, practically there will be no one using that function since the filtering API is mostly private, so that function alone is not usable. --- libavfilter/avfilter.h | 4 ---- libavfilter/version.h | 2 +- libavfilter/vf_boxblur.c | 2 +- libavfilter/video.c | 6 ------ 4 files changed, 2 insertions(+), 12 deletions(-) diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h index 4750cfdec96..d66bc000be0 100644 --- a/libavfilter/avfilter.h +++ b/libavfilter/avfilter.h @@ -410,10 +410,6 @@ const char *avfilter_pad_get_name(AVFilterPad *pads, int pad_idx); */ enum AVMediaType avfilter_pad_get_type(AVFilterPad *pads, int pad_idx); -/** default handler for end_frame() for video inputs */ -attribute_deprecated -int avfilter_default_end_frame(AVFilterLink *link); - /** * Filter definition. This defines the pads a filter contains, and all the * callback functions used to interact with the filter. diff --git a/libavfilter/version.h b/libavfilter/version.h index 8c9d4e1b8fe..607948d7f0f 100644 --- a/libavfilter/version.h +++ b/libavfilter/version.h @@ -30,7 +30,7 @@ #define LIBAVFILTER_VERSION_MAJOR 3 #define LIBAVFILTER_VERSION_MINOR 16 -#define LIBAVFILTER_VERSION_MICRO 100 +#define LIBAVFILTER_VERSION_MICRO 101 #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \ LIBAVFILTER_VERSION_MINOR, \ diff --git a/libavfilter/vf_boxblur.c b/libavfilter/vf_boxblur.c index 904052970ce..c5056c57322 100644 --- a/libavfilter/vf_boxblur.c +++ b/libavfilter/vf_boxblur.c @@ -329,7 +329,7 @@ static int end_frame(AVFilterLink *inlink) boxblur->temp); ff_draw_slice(outlink, 0, inlink->h, 1); - return avfilter_default_end_frame(inlink); + return ff_end_frame(outlink); } AVFilter avfilter_vf_boxblur = { diff --git a/libavfilter/video.c b/libavfilter/video.c index 14e7e72f41e..5294c1b62dc 100644 --- a/libavfilter/video.c +++ b/libavfilter/video.c @@ -406,9 +406,3 @@ int ff_draw_slice(AVFilterLink *link, int y, int h, int slice_dir) av_assert1(link->cur_buf_copy->buf->refcount > 0); return ret; } - -int avfilter_default_end_frame(AVFilterLink *inlink) -{ - return default_end_frame(inlink); -} - -- 2.39.5