[libav-devel] [PATCH] lavfi: Drop deprecated non-const filter retrieval

[Vittorio Giovara]

Deprecated in 10/2013.
---
Updated to fix a couple of warnings that the removal introduced.
Vittorio

 libavfilter/avfilter.c      | 5 +----
 libavfilter/avfilter.h      | 5 +----
 libavfilter/avfiltergraph.c | 2 +-
 libavfilter/graphparser.c   | 2 +-
 libavfilter/version.h       | 4 ----
 5 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c
index 3ae7a591db..83c1a7c20d 100644
--- a/libavfilter/avfilter.c
+++ b/libavfilter/avfilter.c
@@ -292,10 +292,7 @@ int ff_poll_frame(AVFilterLink *link)
 
 static AVFilter *first_filter;
 
-#if !FF_API_NOCONST_GET_NAME
-const
-#endif
-AVFilter *avfilter_get_by_name(const char *name)
+const AVFilter *avfilter_get_by_name(const char *name)
 {
     const AVFilter *f = NULL;
 
diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h
index 96d3e31863..6df69dbbbf 100644
--- a/libavfilter/avfilter.h
+++ b/libavfilter/avfilter.h
@@ -449,10 +449,7 @@ int avfilter_register(AVFilter *filter);
  * @return     the filter definition, if any matching one is registered.
  *             NULL if none found.
  */
-#if !FF_API_NOCONST_GET_NAME
-const
-#endif
-AVFilter *avfilter_get_by_name(const char *name);
+const AVFilter *avfilter_get_by_name(const char *name);
 
 /**
  * Iterate over all registered filters.
diff --git a/libavfilter/avfiltergraph.c b/libavfilter/avfiltergraph.c
index 58ede68a31..0a266a00cd 100644
--- a/libavfilter/avfiltergraph.c
+++ b/libavfilter/avfiltergraph.c
@@ -293,7 +293,7 @@ static int query_formats(AVFilterGraph *graph, AVClass 
*log_ctx)
 
             if (convert_needed) {
                 AVFilterContext *convert;
-                AVFilter *filter;
+                const AVFilter *filter;
                 AVFilterLink *inlink, *outlink;
                 char scale_args[256];
                 char inst_name[30];
diff --git a/libavfilter/graphparser.c b/libavfilter/graphparser.c
index da499b52c9..4c75c045f1 100644
--- a/libavfilter/graphparser.c
+++ b/libavfilter/graphparser.c
@@ -131,7 +131,7 @@ static void append_sws_flags(const char **args, const char 
*sws_opts, char *tmp)
 static int create_filter(AVFilterContext **filt_ctx, AVFilterGraph *ctx, int 
index,
                          const char *filt_name, const char *args, void 
*log_ctx)
 {
-    AVFilter *filt;
+    const AVFilter *filt;
     char inst_name[30];
     char tmp_args[TMP_ARGS_SIZE];
     int ret;
diff --git a/libavfilter/version.h b/libavfilter/version.h
index 4f3da2bd10..62fc97dd27 100644
--- a/libavfilter/version.h
+++ b/libavfilter/version.h
@@ -49,8 +49,4 @@
  * the public API and may change, break or disappear at any time.
  */
 
-#ifndef FF_API_NOCONST_GET_NAME
-#define FF_API_NOCONST_GET_NAME             (LIBAVFILTER_VERSION_MAJOR < 7)
-#endif
-
 #endif /* AVFILTER_VERSION_H */
-- 
2.12.0

_______________________________________________
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel