diff options
| author | Clément Bœsch <ubitux@gmail.com> | 2013-04-11 18:23:18 +0200 |
|---|---|---|
| committer | Clément Bœsch <ubitux@gmail.com> | 2013-04-11 22:13:45 +0200 |
| commit | 9ab221f8d82da9e2cf1503cc5db115838d766d97 (patch) | |
| tree | b89af13934dd99ea11076d5dffc6b717c5599263 /libavfilter | |
| parent | 71ef1ec7b482d7222717faae0a51f2fd4ef3bdf2 (diff) | |
| download | ffmpeg-9ab221f8d82da9e2cf1503cc5db115838d766d97.tar.gz | |
lavfi: deprecate aconvert.
This filter is not required anymore with aformat. Drop it at next bump.
Diffstat (limited to 'libavfilter')
| -rw-r--r-- | libavfilter/af_aconvert.c | 2 | ||||
| -rw-r--r-- | libavfilter/allfilters.c | 2 | ||||
| -rw-r--r-- | libavfilter/avfilter.c | 2 | ||||
| -rw-r--r-- | libavfilter/avfiltergraph.h | 2 | ||||
| -rw-r--r-- | libavfilter/version.h | 3 |
5 files changed, 10 insertions, 1 deletions
diff --git a/libavfilter/af_aconvert.c b/libavfilter/af_aconvert.c index 1fc06f2085..71f4d24e95 100644 --- a/libavfilter/af_aconvert.c +++ b/libavfilter/af_aconvert.c @@ -45,6 +45,8 @@ static av_cold int init(AVFilterContext *ctx, const char *args0) int ret = 0; char *args = av_strdup(args0); + av_log(ctx, AV_LOG_WARNING, "This filter is deprecated, use aformat instead\n"); + aconvert->out_sample_fmt = AV_SAMPLE_FMT_NONE; aconvert->out_chlayout = 0; diff --git a/libavfilter/allfilters.c b/libavfilter/allfilters.c index 721db2ecb2..4c8f2b4a59 100644 --- a/libavfilter/allfilters.c +++ b/libavfilter/allfilters.c @@ -45,7 +45,9 @@ void avfilter_register_all(void) return; initialized = 1; +#if FF_API_ACONVERT_FILTER REGISTER_FILTER(ACONVERT, aconvert, af); +#endif REGISTER_FILTER(AFADE, afade, af); REGISTER_FILTER(AFORMAT, aformat, af); REGISTER_FILTER(ALLPASS, allpass, af); diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index ff309f436c..d20c74d42a 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -675,7 +675,9 @@ static int process_options(AVFilterContext *ctx, AVDictionary **options, // TODO: drop me static const char *const filters_left_to_update[] = { "abuffer", +#if FF_API_ACONVERT_FILTER "aconvert", +#endif "atempo", "buffer", "mp", diff --git a/libavfilter/avfiltergraph.h b/libavfilter/avfiltergraph.h index 61110f99a1..2210bfe0fd 100644 --- a/libavfilter/avfiltergraph.h +++ b/libavfilter/avfiltergraph.h @@ -98,7 +98,7 @@ int avfilter_graph_create_filter(AVFilterContext **filt_ctx, AVFilter *filt, * Enable or disable automatic format conversion inside the graph. * * Note that format conversion can still happen inside explicitly inserted - * scale and aconvert filters. + * scale and aresample filters. * * @param flags any of the AVFILTER_AUTO_CONVERT_* constants */ diff --git a/libavfilter/version.h b/libavfilter/version.h index 9c5b99fe01..021ff0520d 100644 --- a/libavfilter/version.h +++ b/libavfilter/version.h @@ -66,5 +66,8 @@ #ifndef FF_API_OLD_FILTER_OPTS #define FF_API_OLD_FILTER_OPTS (LIBAVFILTER_VERSION_MAJOR < 4) #endif +#ifndef FF_API_ACONVERT_FILTER +#define FF_API_ACONVERT_FILTER (LIBAVFILTER_VERSION_MAJOR < 4) +#endif #endif /* AVFILTER_VERSION_H */ |