Merge commit 'c5c7cfd5e80d4c36568c01cc40abfde341657ad9'
authorJames Almer <jamrial@gmail.com>
Sat, 21 Oct 2017 18:28:35 +0000 (15:28 -0300)
committerJames Almer <jamrial@gmail.com>
Sat, 21 Oct 2017 18:28:35 +0000 (15:28 -0300)
* commit 'c5c7cfd5e80d4c36568c01cc40abfde341657ad9':
  lavfi: Drop deprecated functions to open a filter or a filterchain

Merged-by: James Almer <jamrial@gmail.com>
1  2 
libavfilter/avfilter.c
libavfilter/avfilter.h
libavfilter/avfiltergraph.c
libavfilter/version.h

Simple merge
@@@ -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
Simple merge
   * 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