diff mbox series

[FFmpeg-devel,51/87] avfilter: Remove deprecated resample_lavr_opts

Message ID 20210419141024.8174-52-jamrial@gmail.com
State Accepted
Commit 339af976b6fd9c05d1e75e75a5323efdb3d6afa1
Headers show
Series Major bump | expand

Checks

Context Check Description
andriy/configure warning Failed to apply patch

Commit Message

James Almer April 19, 2021, 2:09 p.m. UTC 
From: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>

Deprecated in 3796fb2692f87d0000fc0aa4572ac025a6469c2b.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
---
 libavfilter/avfilter.h      | 3 ---
 libavfilter/avfiltergraph.c | 3 ---
 libavfilter/version.h       | 3 ---
 3 files changed, 9 deletions(-)

Comments

Nicolas George April 19, 2021, 2:23 p.m. UTC | #1 
James Almer (12021-04-19):
> From: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
> 
> Deprecated in 3796fb2692f87d0000fc0aa4572ac025a6469c2b.
> 
> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
> ---
>  libavfilter/avfilter.h      | 3 ---
>  libavfilter/avfiltergraph.c | 3 ---
>  libavfilter/version.h       | 3 ---
>  3 files changed, 9 deletions(-)

Ok.

Regards,
diff mbox series

Patch

diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h
index be1242436b..b5e092f8bc 100644
--- 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 f6b572b3de..ed54d3dc11 100644
--- 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 fd38252411..ba9ff5f633 100644
--- 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