avfilter: Remove deprecated resample_lavr_opts

Deprecated in 3796fb2692f87d0000fc0aa4572ac025a6469c2b.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>

diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h
index be1242436ba7cd02d19e6c424652a381eb85d075..b5e092f8bc0d3b7cafa96a24b49cca1c3cf30660 100644 (file)
--- a/libavfilter/avfilter.h
+++ b/libavfilter/avfilter.h
@@ -853,9 +853,6 @@ typedef struct AVFilterGraph {
     unsigned nb_filters;
 
     char *scale_sws_opts; ///< sws options to use for the auto-inserted scale filters
-#if FF_API_LAVR_OPTS
-    attribute_deprecated char *resample_lavr_opts;   ///< libavresample options to use for the auto-inserted resample filters
-#endif
 
     /**
      * Type of multithreading allowed for filters in this graph. A combination

diff --git a/libavfilter/avfiltergraph.c b/libavfilter/avfiltergraph.c
index f6b572b3de02e26d28ca6f1d1e5316d13565c1d8..ed54d3dc1137fedfe8cc7f8a0d13f1ebb51325a6 100644 (file)
--- a/libavfilter/avfiltergraph.c
+++ b/libavfilter/avfiltergraph.c
@@ -131,9 +131,6 @@ void avfilter_graph_free(AVFilterGraph **graph)
 
     av_freep(&(*graph)->scale_sws_opts);
     av_freep(&(*graph)->aresample_swr_opts);
-#if FF_API_LAVR_OPTS
-    av_freep(&(*graph)->resample_lavr_opts);
-#endif
     av_freep(&(*graph)->filters);
     av_freep(&(*graph)->internal);
     av_freep(graph);

diff --git a/libavfilter/version.h b/libavfilter/version.h
index fd382524112b7b2148b17aa3fbd16b82f0128e69..ba9ff5f63321d5f15333d6bf3d49ee10509d9984 100644 (file)
--- a/libavfilter/version.h
+++ b/libavfilter/version.h
@@ -50,9 +50,6 @@
  * the public API and may change, break or disappear at any time.
  */
 
-#ifndef FF_API_LAVR_OPTS
-#define FF_API_LAVR_OPTS                    (LIBAVFILTER_VERSION_MAJOR < 8)
-#endif
 #ifndef FF_API_FILTER_GET_SET
 #define FF_API_FILTER_GET_SET               (LIBAVFILTER_VERSION_MAJOR < 8)
 #endif