avfilter: avoid zero arguments to variadic macro
authorGanesh Ajjanagadde <gajjanagadde@gmail.com>
Fri, 23 Oct 2015 16:36:52 +0000 (12:36 -0400)
committerGanesh Ajjanagadde <gajjanagadde@gmail.com>
Sat, 24 Oct 2015 14:18:55 +0000 (10:18 -0400)
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>
libavfilter/af_asetrate.c
libavfilter/asrc_sine.c

index 409c48f..66febd7 100644 (file)
@@ -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},
 };
 
index cd43ae4..f361faa 100644 (file)
@@ -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}
 };