[FFmpeg-cvslog] avfilter/avf_abitscope: rename macro to less generic one

Paul B Mahol git at videolan.org
Mon Mar 14 19:26:30 EET 2022


ffmpeg | branch: master | Paul B Mahol <onemda at gmail.com> | Mon Mar 14 18:25:10 2022 +0100| [58f867ffef38ff8694dbed537b99521c24345320] | committer: Paul B Mahol

avfilter/avf_abitscope: rename macro to less generic one

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

 libavfilter/avf_abitscope.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/libavfilter/avf_abitscope.c b/libavfilter/avf_abitscope.c
index e6415ddfbf..1db7f77a5b 100644
--- a/libavfilter/avf_abitscope.c
+++ b/libavfilter/avf_abitscope.c
@@ -174,7 +174,7 @@ static int config_output(AVFilterLink *outlink)
         }                                                                   \
     }
 
-#define TRACE(type, depth, one)                                             \
+#define DO_TRACE(type, depth, one)                                          \
     for (int ch = 0; ch < inlink->channels; ch++) {                         \
         const int w = outpicref->width / inlink->channels;                  \
         const type *in = (const type *)insamples->extended_data[ch];        \
@@ -238,18 +238,18 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *insamples)
 
     switch (insamples->format) {
     case AV_SAMPLE_FMT_U8P:
-        if (s->mode == 0) { BARS(uint8_t,   8, 1) } else { TRACE(uint8_t,   8, 1) }
+        if (s->mode == 0) { BARS(uint8_t,   8, 1) } else { DO_TRACE(uint8_t,   8, 1) }
         break;
     case AV_SAMPLE_FMT_S16P:
-        if (s->mode == 0) { BARS(uint16_t, 16, 1) } else { TRACE(uint16_t, 16, 1) }
+        if (s->mode == 0) { BARS(uint16_t, 16, 1) } else { DO_TRACE(uint16_t, 16, 1) }
         break;
     case AV_SAMPLE_FMT_FLTP:
     case AV_SAMPLE_FMT_S32P:
-        if (s->mode == 0) { BARS(uint32_t, 32, 1U) } else { TRACE(uint32_t, 32, 1U) }
+        if (s->mode == 0) { BARS(uint32_t, 32, 1U) } else { DO_TRACE(uint32_t, 32, 1U) }
         break;
     case AV_SAMPLE_FMT_DBLP:
     case AV_SAMPLE_FMT_S64P:
-        if (s->mode == 0) { BARS(uint64_t, 64, 1ULL) } else { TRACE(uint64_t, 64, 1ULL) }
+        if (s->mode == 0) { BARS(uint64_t, 64, 1ULL) } else { DO_TRACE(uint64_t, 64, 1ULL) }
         break;
     }
 



More information about the ffmpeg-cvslog mailing list