[FFmpeg-cvslog] Merge commit 'c5c7cfd5e80d4c36568c01cc40abfde341657ad9'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Sat Oct 21 15:28:35 2017 -0300| [7c4f63d05b3393d1034e1edc2266440e33925100] | committer: James Almer

Merge commit 'c5c7cfd5e80d4c36568c01cc40abfde341657ad9'

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

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7c4f63d05b3393d1034e1edc2266440e33925100
---

 libavfilter/avfilter.c      |  8 --------
 libavfilter/avfilter.h      | 30 ------------------------------
 libavfilter/avfiltergraph.c | 17 -----------------
 libavfilter/version.h       |  3 ---
 4 files changed, 58 deletions(-)

diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c
index a08895dacf..07c35d7dda 100644
--- a/libavfilter/avfilter.c
+++ b/libavfilter/avfilter.c
@@ -783,14 +783,6 @@ err:
     return NULL;
 }
 
-#if FF_API_AVFILTER_OPEN
-int avfilter_open(AVFilterContext **filter_ctx, AVFilter *filter, const char *inst_name)
-{
-    *filter_ctx = ff_filter_alloc(filter, inst_name);
-    return *filter_ctx ? 0 : AVERROR(ENOMEM);
-}
-#endif
-
 static void free_link(AVFilterLink *link)
 {
     if (!link)
diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h
index 73a723d583..3d7bd33215 100644
--- a/libavfilter/avfilter.h
+++ b/libavfilter/avfilter.h
@@ -729,22 +729,6 @@ attribute_deprecated
 AVFilter **av_filter_next(AVFilter **filter);
 #endif
 
-#if FF_API_AVFILTER_OPEN
-/**
- * Create a filter instance.
- *
- * @param filter_ctx put here a pointer to the created filter context
- * on success, NULL on failure
- * @param filter    the filter to create an instance of
- * @param inst_name Name to give to the new instance. Can be NULL for none.
- * @return >= 0 in case of success, a negative error code otherwise
- * @deprecated use avfilter_graph_alloc_filter() instead
- */
-attribute_deprecated
-int avfilter_open(AVFilterContext **filter_ctx, AVFilter *filter, const char *inst_name);
-#endif
-
-
 #if FF_API_AVFILTER_INIT_FILTER
 /**
  * Initialize a filter.
@@ -959,20 +943,6 @@ AVFilterContext *avfilter_graph_alloc_filter(AVFilterGraph *graph,
  */
 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 --git a/libavfilter/avfiltergraph.c b/libavfilter/avfiltergraph.c
index 4304c06847..76a3a2b8ed 100644
--- a/libavfilter/avfiltergraph.c
+++ b/libavfilter/avfiltergraph.c
@@ -136,23 +136,6 @@ void avfilter_graph_free(AVFilterGraph **graph)
     av_freep(graph);
 }
 
-#if FF_API_AVFILTER_OPEN
-int avfilter_graph_add_filter(AVFilterGraph *graph, AVFilterContext *filter)
-{
-    AVFilterContext **filters = av_realloc(graph->filters,
-                                           sizeof(*filters) * (graph->nb_filters + 1));
-    if (!filters)
-        return AVERROR(ENOMEM);
-
-    graph->filters = filters;
-    graph->filters[graph->nb_filters++] = filter;
-
-    filter->graph = graph;
-
-    return 0;
-}
-#endif
-
 int avfilter_graph_create_filter(AVFilterContext **filt_ctx, const AVFilter *filt,
                                  const char *name, const char *args, void *opaque,
                                  AVFilterGraph *graph_ctx)
diff --git a/libavfilter/version.h b/libavfilter/version.h
index e3bdd0253f..ad2178241e 100644
--- a/libavfilter/version.h
+++ b/libavfilter/version.h
@@ -52,9 +52,6 @@
 #ifndef FF_API_OLD_FILTER_OPTS_ERROR
 #define FF_API_OLD_FILTER_OPTS_ERROR        (LIBAVFILTER_VERSION_MAJOR < 8)
 #endif
-#ifndef FF_API_AVFILTER_OPEN
-#define FF_API_AVFILTER_OPEN                (LIBAVFILTER_VERSION_MAJOR < 7)
-#endif
 #ifndef FF_API_AVFILTER_INIT_FILTER
 #define FF_API_AVFILTER_INIT_FILTER         (LIBAVFILTER_VERSION_MAJOR < 7)
 #endif


======================================================================

diff --cc libavfilter/avfilter.h
index 73a723d583,babcec66f2..3d7bd33215
--- a/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/version.h
index e3bdd0253f,540ac48f9b..ad2178241e
--- a/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_OLD_FILTER_OPTS_ERROR
 +#define FF_API_OLD_FILTER_OPTS_ERROR        (LIBAVFILTER_VERSION_MAJOR < 8)
 +#endif
- #ifndef FF_API_AVFILTER_OPEN
- #define FF_API_AVFILTER_OPEN                (LIBAVFILTER_VERSION_MAJOR < 7)
- #endif
  #ifndef FF_API_AVFILTER_INIT_FILTER
  #define FF_API_AVFILTER_INIT_FILTER         (LIBAVFILTER_VERSION_MAJOR < 7)
  #endif