summaryrefslogtreecommitdiff
path: root/libavfilter
diff options
context:
space:
mode:
authorGanesh Ajjanagadde <gajjanagadde@gmail.com>2015-10-23 12:36:52 -0400
committerGanesh Ajjanagadde <gajjanagadde@gmail.com>2015-10-24 10:18:55 -0400
commit683462911db5ba1b17c32c523cdefe921f5aaf17 (patch)
tree7f66f5e7c9809cd2604cc6db44237db9ddbd8c6f /libavfilter
parent5e9f14e4bf3a30934892a1801f24e838495762de (diff)
avfilter: avoid zero arguments to variadic macro
ISO C requires at least one argument in the place of the ellipsis in a variadic macro. In particular, under -pedantic, this triggers the warning -Wgnu-zero-variadic-macro-arguments on clang 3.7. Reviewed-by: Nicolas George <george@nsup.org> Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
Diffstat (limited to 'libavfilter')
-rw-r--r--libavfilter/af_asetrate.c4
-rw-r--r--libavfilter/asrc_sine.c18
2 files changed, 11 insertions, 11 deletions
diff --git a/libavfilter/af_asetrate.c b/libavfilter/af_asetrate.c
index 409c48fd14..66febd71ba 100644
--- a/libavfilter/af_asetrate.c
+++ b/libavfilter/af_asetrate.c
@@ -39,8 +39,8 @@ typedef struct {
OPT_GENERIC(name, field, def, min, max, descr, INT, i64, __VA_ARGS__)
static const AVOption asetrate_options[] = {
- OPT_INT("sample_rate", sample_rate, 44100, 1, INT_MAX, "set the sample rate"),
- OPT_INT("r", sample_rate, 44100, 1, INT_MAX, "set the sample rate"),
+ OPT_INT("sample_rate", sample_rate, 44100, 1, INT_MAX, "set the sample rate",),
+ OPT_INT("r", sample_rate, 44100, 1, INT_MAX, "set the sample rate",),
{NULL},
};
diff --git a/libavfilter/asrc_sine.c b/libavfilter/asrc_sine.c
index cd43ae444e..f361faa233 100644
--- a/libavfilter/asrc_sine.c
+++ b/libavfilter/asrc_sine.c
@@ -67,15 +67,15 @@ typedef struct {
OPT_GENERIC(name, field, def, min, max, descr, STRING, str, __VA_ARGS__)
static const AVOption sine_options[] = {
- OPT_DBL("frequency", frequency, 440, 0, DBL_MAX, "set the sine frequency"),
- OPT_DBL("f", frequency, 440, 0, DBL_MAX, "set the sine frequency"),
- OPT_DBL("beep_factor", beep_factor, 0, 0, DBL_MAX, "set the beep fequency factor"),
- OPT_DBL("b", beep_factor, 0, 0, DBL_MAX, "set the beep fequency factor"),
- OPT_INT("sample_rate", sample_rate, 44100, 1, INT_MAX, "set the sample rate"),
- OPT_INT("r", sample_rate, 44100, 1, INT_MAX, "set the sample rate"),
- OPT_DUR("duration", duration, 0, 0, INT64_MAX, "set the audio duration"),
- OPT_DUR("d", duration, 0, 0, INT64_MAX, "set the audio duration"),
- OPT_STR("samples_per_frame", samples_per_frame, "1024", 0, 0, "set the number of samples per frame"),
+ OPT_DBL("frequency", frequency, 440, 0, DBL_MAX, "set the sine frequency",),
+ OPT_DBL("f", frequency, 440, 0, DBL_MAX, "set the sine frequency",),
+ OPT_DBL("beep_factor", beep_factor, 0, 0, DBL_MAX, "set the beep fequency factor",),
+ OPT_DBL("b", beep_factor, 0, 0, DBL_MAX, "set the beep fequency factor",),
+ OPT_INT("sample_rate", sample_rate, 44100, 1, INT_MAX, "set the sample rate",),
+ OPT_INT("r", sample_rate, 44100, 1, INT_MAX, "set the sample rate",),
+ OPT_DUR("duration", duration, 0, 0, INT64_MAX, "set the audio duration",),
+ OPT_DUR("d", duration, 0, 0, INT64_MAX, "set the audio duration",),
+ OPT_STR("samples_per_frame", samples_per_frame, "1024", 0, 0, "set the number of samples per frame",),
{NULL}
};