diff options
Diffstat (limited to 'libavfilter')
-rw-r--r-- | libavfilter/avfilter.h | 4 | ||||
-rw-r--r-- | libavfilter/avfiltergraph.c | 2 | ||||
-rw-r--r-- | libavfilter/version.h | 5 |
3 files changed, 9 insertions, 2 deletions
diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h index b56615c98e..ac6dca4fc0 100644 --- a/libavfilter/avfilter.h +++ b/libavfilter/avfilter.h @@ -841,7 +841,9 @@ typedef struct AVFilterGraph { unsigned nb_filters; char *scale_sws_opts; ///< sws options to use for the auto-inserted scale filters - char *resample_lavr_opts; ///< libavresample options to use for the auto-inserted resample 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 534c6701a8..75bd516896 100644 --- a/libavfilter/avfiltergraph.c +++ b/libavfilter/avfiltergraph.c @@ -128,7 +128,9 @@ 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 e67f34b611..c2684bfe94 100644 --- a/libavfilter/version.h +++ b/libavfilter/version.h @@ -30,7 +30,7 @@ #include "libavutil/version.h" #define LIBAVFILTER_VERSION_MAJOR 6 -#define LIBAVFILTER_VERSION_MINOR 76 +#define LIBAVFILTER_VERSION_MINOR 77 #define LIBAVFILTER_VERSION_MICRO 100 #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \ @@ -67,5 +67,8 @@ #ifndef FF_API_NOCONST_GET_NAME #define FF_API_NOCONST_GET_NAME (LIBAVFILTER_VERSION_MAJOR < 7) #endif +#ifndef FF_API_LAVR_OPTS +#define FF_API_LAVR_OPTS (LIBAVFILTER_VERSION_MAJOR < 7) +#endif #endif /* AVFILTER_VERSION_H */ |