diff options
| author | Matthias Troffaes <matthias.troffaes@gmail.com> | 2019-04-29 11:03:52 +0200 |
|---|---|---|
| committer | Paul B Mahol <onemda@gmail.com> | 2019-04-29 11:08:49 +0200 |
| commit | 90b21ae5b5f8858e5af92c3e096af7ec56f17c6e (patch) | |
| tree | a22537efcb01a316ed4274326bdb41e16b9840f6 /libavfilter | |
| parent | 45048ece81d395431d5604cf30596aaa62692da3 (diff) | |
| download | ffmpeg-90b21ae5b5f8858e5af92c3e096af7ec56f17c6e.tar.gz | |
avfilter/af_astats: fix msvc compile error
MSVC requires an explicit cast from void * to void when applying the
ternary conditional operator to switch between methods that return
void.
Diffstat (limited to 'libavfilter')
| -rw-r--r-- | libavfilter/af_astats.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavfilter/af_astats.c b/libavfilter/af_astats.c index 1ec56d72cc..bb9a23a017 100644 --- a/libavfilter/af_astats.c +++ b/libavfilter/af_astats.c @@ -496,7 +496,7 @@ static void set_metadata(AudioStatsContext *s, AVDictionary **metadata) #define UPDATE_STATS(planar, type, sample, normalizer_suffix, int_sample) \ if ((s->measure_overall | s->measure_perchannel) & ~MEASURE_MINMAXPEAK) { \ - UPDATE_STATS_##planar(type, update_stat(s, p, sample, sample normalizer_suffix, int_sample), s->is_float ? update_float_stat(s, p, sample) : s->is_double ? update_double_stat(s, p, sample) : NULL, ); \ + UPDATE_STATS_##planar(type, update_stat(s, p, sample, sample normalizer_suffix, int_sample), s->is_float ? update_float_stat(s, p, sample) : s->is_double ? update_double_stat(s, p, sample) : (void)NULL, ); \ } else { \ UPDATE_STATS_##planar(type, update_minmax(s, p, sample), , p->nmin = p->min normalizer_suffix; p->nmax = p->max normalizer_suffix;); \ } |