[FFmpeg-cvslog] avfilter: Remove deprecated resample_lavr_opts
Andreas Rheinhardt
git at videolan.org
Wed Apr 28 00:15:54 EEST 2021
ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at gmail.com> | Sat Mar 6 17:52:24 2021 +0100| [339af976b6fd9c05d1e75e75a5323efdb3d6afa1] | committer: James Almer
avfilter: Remove deprecated resample_lavr_opts
Deprecated in 3796fb2692f87d0000fc0aa4572ac025a6469c2b.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at gmail.com>
Signed-off-by: James Almer <jamrial at gmail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=339af976b6fd9c05d1e75e75a5323efdb3d6afa1
---
libavfilter/avfilter.h | 3 ---
libavfilter/avfiltergraph.c | 3 ---
libavfilter/version.h | 3 ---
3 files changed, 9 deletions(-)
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
More information about the ffmpeg-cvslog
mailing list