[FFmpeg-cvslog] avfilter/af_astats: fix msvc compile error

Matthias Troffaes git at videolan.org
Mon Apr 29 12:12:37 EEST 2019


ffmpeg | branch: master | Matthias Troffaes <matthias.troffaes at gmail.com> | Mon Apr 29 11:03:52 2019 +0200| [90b21ae5b5f8858e5af92c3e096af7ec56f17c6e] | committer: Paul B Mahol

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.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=90b21ae5b5f8858e5af92c3e096af7ec56f17c6e
---

 libavfilter/af_astats.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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;); \
     }



More information about the ffmpeg-cvslog mailing list