Merge commit 'c5c7cfd5e80d4c36568c01cc40abfde341657ad9'

* commit 'c5c7cfd5e80d4c36568c01cc40abfde341657ad9':
  lavfi: Drop deprecated functions to open a filter or a filterchain

Merged-by: James Almer <jamrial@gmail.com>

diff --cc libavfilter/avfilter.c
Simple merge

diff --cc libavfilter/avfilter.h
index 73a723d583311b1cf70ec8e5da62aa2a469434ce,babcec66f2ca1c2353cca8d9d9d50cb7d6751d78..3d7bd332155ed3a61d69473db4a7d06b5d3f969c
--- 1/libavfilter/avfilter.h
--- 2/libavfilter/avfilter.h
+++ b/libavfilter/avfilter.h
@@@ -957,22 -673,8 +941,8 @@@ AVFilterContext *avfilter_graph_alloc_f
   * @return the pointer to the found filter instance or NULL if it
   * cannot be found.
   */
 -AVFilterContext *avfilter_graph_get_filter(AVFilterGraph *graph, char *name);
 +AVFilterContext *avfilter_graph_get_filter(AVFilterGraph *graph, const char *name);
  
- #if FF_API_AVFILTER_OPEN
- /**
-  * Add an existing filter instance to a filter graph.
-  *
-  * @param graphctx  the filter graph
-  * @param filter the filter to be added
-  *
-  * @deprecated use avfilter_graph_alloc_filter() to allocate a filter in a
-  * filter graph
-  */
- attribute_deprecated
- int avfilter_graph_add_filter(AVFilterGraph *graphctx, AVFilterContext *filter);
- #endif
- 
  /**
   * Create and add a filter instance into an existing graph.
   * The filter instance is created from the filter filt and inited

diff --cc libavfilter/avfiltergraph.c
Simple merge

diff --cc libavfilter/version.h
index e3bdd0253fdaf9546fe0e4f0117c1fc7ba798011,540ac48f9b5dd757a90c9a00fcf68f456f0ebdcd..ad2178241e351f2a6986875f6328f09128dd16f1
--- 1/libavfilter/version.h
--- 2/libavfilter/version.h
+++ b/libavfilter/version.h
@@@ -49,12 -49,6 +49,9 @@@
   * the public API and may change, break or disappear at any time.
   */
  
- #ifndef FF_API_AVFILTER_OPEN
- #define FF_API_AVFILTER_OPEN                (LIBAVFILTER_VERSION_MAJOR < 7)
- #endif
 +#ifndef FF_API_OLD_FILTER_OPTS_ERROR
 +#define FF_API_OLD_FILTER_OPTS_ERROR        (LIBAVFILTER_VERSION_MAJOR < 8)
 +#endif
  #ifndef FF_API_AVFILTER_INIT_FILTER
  #define FF_API_AVFILTER_INIT_FILTER         (LIBAVFILTER_VERSION_MAJOR < 7)
  #endif