Not used by anything at all since we don't auto insert lavr filters. Signed-off-by: Rostislav Pehlivanov <atomnu...@gmail.com> --- doc/APIchanges | 4 ++++ libavfilter/avfilter.h | 4 +++- libavfilter/avfiltergraph.c | 2 ++ libavfilter/version.h | 5 ++++- libavformat/version.h | 1 - 5 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/doc/APIchanges b/doc/APIchanges index 6922ea5268..2275f0da4b 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -15,6 +15,10 @@ libavutil: 2015-08-28 API changes, most recent first: +2017-03-02 - xxxxxxx - lavfi 6.75.100 - avfilter.h + Deprecate AVFilterGraph.resample_lavr_opts + Its never been used by avfilter and never given to anything + 2017-03-02 - xxxxxxx - lavc 57.81.104 - videotoolbox.h AVVideotoolboxContext.cv_pix_fmt_type can now be set to 0 to output the native decoder format. (The default value is not changed.) 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 11db8d5513..3cd6e24b27 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 74 +#define LIBAVFILTER_VERSION_MINOR 75 #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 */ diff --git a/libavformat/version.h b/libavformat/version.h index cd505242ef..4a12d7d947 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -89,7 +89,6 @@ #define FF_API_HLS_WRAP (LIBAVFORMAT_VERSION_MAJOR < 58) #endif - #ifndef FF_API_R_FRAME_RATE #define FF_API_R_FRAME_RATE 1 #endif -- 2.12.0.rc1.440.g5b76565f74 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel