Merge commit '8114c101607843a86960bd3e0e9c40487dc2a961'

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

Conflicts:
	libavfilter/avfilter.h

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

1 files changed, 7 insertions, 6 deletions

diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h
index b19d652f86..effa4070bb 100644
--- a/libavfilter/avfilter.h
+++ b/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 */