Merge commit '8114c101607843a86960bd3e0e9c40487dc2a961'

* commit '8114c101607843a86960bd3e0e9c40487dc2a961':
  lavfi: add avfilter_get_class().

Conflicts:
	libavfilter/avfilter.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>

1 files changed, 5 insertions, 5 deletions

diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c
index c441629d96..5dd4965671 100644
--- a/libavfilter/avfilter.c
+++ b/libavfilter/avfilter.c
@@ -490,11 +490,6 @@ static const AVClass avfilter_class = {
     .child_class_next = filter_child_class_next,
 };
 
-const AVClass *avfilter_get_class(void)
-{
-    return &avfilter_class;
-}
-
 int avfilter_open(AVFilterContext **filter_ctx, AVFilter *filter, const char *inst_name)
 {
     AVFilterContext *ret;
@@ -1038,3 +1033,8 @@ int ff_filter_frame(AVFilterLink *link, AVFrame *frame)
         return ff_filter_frame_framed(link, frame);
     }
 }
+
+const AVClass *avfilter_get_class(void)
+{
+    return &avfilter_class;
+}