Merge commit '8114c101607843a86960bd3e0e9c40487dc2a961'

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

Conflicts:
	libavfilter/avfilter.h

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

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;
+}

libavfilter/avfilter.h

@@ -60,11 +60,6 @@ const char *avfilter_configuration(void);
  */
 const char *avfilter_license(void);
 
-/**
- * Get the class for the AVFilterContext struct.
- */
-const AVClass *avfilter_get_class(void);
-
 typedef struct AVFilterContext AVFilterContext;
 typedef struct AVFilterLink    AVFilterLink;
 typedef struct AVFilterPad     AVFilterPad;
@@ -911,7 +906,13 @@ int avfilter_copy_buf_props(AVFrame *dst, const AVFilterBufferRef *src);
 #endif
 
 /**
- * @}
+ * @return AVClass for AVFilterContext.
+ *
+ * @see av_opt_find().
  */
+const AVClass *avfilter_get_class(void);
 
+/**
+ * @}
+ */
 #endif /* AVFILTER_AVFILTER_H */