diff mbox

[FFmpeg-devel] lavfi: rename af_aresample to af_resample

Message ID 20170306084821.2204-1-atomnuker@gmail.com
State Superseded
Headers show

Commit Message

Rostislav Pehlivanov March 6, 2017, 8:48 a.m. UTC 
Meant to be applied on top of the patch which removes af_resample

Registers both af_aresample and af_resample as valid filters to mainain
compatibility.

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
---
 MAINTAINERS                                   |  2 +-
 libavfilter/Makefile                          |  2 +-
 libavfilter/{af_aresample.c => af_resample.c} | 12 ++++++++++++
 3 files changed, 14 insertions(+), 2 deletions(-)
 rename libavfilter/{af_aresample.c => af_resample.c} (96%)

Comments

Carl Eugen Hoyos March 6, 2017, 9 a.m. UTC | #1 
2017-03-06 9:48 GMT+01:00 Rostislav Pehlivanov <atomnuker@gmail.com>:

> +AVFilter ff_af_resample = {
> +    .name          = "resample",

Why? Do we really need two identical filters with similar name?

We cannot remove the "aresample" filter that is mentioned
all over our documentation.
We did not support he resample filter for several years,
removing it can't be an issue.

Carl Eugen
diff mbox

Patch

diff --git a/MAINTAINERS b/MAINTAINERS
index c33a976411..eaf721c6c8 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -311,7 +311,7 @@  Filters:
   af_afade.c                            Paul B Mahol
   af_amerge.c                           Nicolas George
   af_aphaser.c                          Paul B Mahol
-  af_aresample.c                        Michael Niedermayer
+  af_resample.c                         Michael Niedermayer
   af_astats.c                           Paul B Mahol
   af_atempo.c                           Pavel Koshevoy
   af_biquads.c                          Paul B Mahol
diff --git a/libavfilter/Makefile b/libavfilter/Makefile
index d3641370de..baaa696b19 100644
--- a/libavfilter/Makefile
+++ b/libavfilter/Makefile
@@ -54,7 +54,7 @@  OBJS-$(CONFIG_APERMS_FILTER)                 += f_perms.o
 OBJS-$(CONFIG_APHASER_FILTER)                += af_aphaser.o generate_wave_table.o
 OBJS-$(CONFIG_APULSATOR_FILTER)              += af_apulsator.o
 OBJS-$(CONFIG_AREALTIME_FILTER)              += f_realtime.o
-OBJS-$(CONFIG_ARESAMPLE_FILTER)              += af_aresample.o
+OBJS-$(CONFIG_ARESAMPLE_FILTER)              += af_resample.o
 OBJS-$(CONFIG_AREVERSE_FILTER)               += f_reverse.o
 OBJS-$(CONFIG_ASELECT_FILTER)                += f_select.o
 OBJS-$(CONFIG_ASENDCMD_FILTER)               += f_sendcmd.o
diff --git a/libavfilter/af_aresample.c b/libavfilter/af_resample.c
similarity index 96%
rename from libavfilter/af_aresample.c
rename to libavfilter/af_resample.c
index 028e105318..1e5d43faff 100644
--- a/libavfilter/af_aresample.c
+++ b/libavfilter/af_resample.c
@@ -338,6 +338,18 @@  static const AVFilterPad aresample_outputs[] = {
     { NULL }
 };
 
+AVFilter ff_af_resample = {
+    .name          = "resample",
+    .description   = NULL_IF_CONFIG_SMALL("Resample audio data."),
+    .init_dict     = init_dict,
+    .uninit        = uninit,
+    .query_formats = query_formats,
+    .priv_size     = sizeof(AResampleContext),
+    .priv_class    = &aresample_class,
+    .inputs        = aresample_inputs,
+    .outputs       = aresample_outputs,
+};
+
 AVFilter ff_af_aresample = {
     .name          = "aresample",
     .description   = NULL_IF_CONFIG_SMALL("Resample audio data."),