[FFmpeg-cvslog] avfilter/showwaves: use INT16_MAX instead of a self defined macro

Clément Bœsch git at videolan.org
Wed Dec 24 15:13:38 CET 2014


ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Wed Dec 24 15:11:23 2014 +0100| [f6950a077cd4a274f3c3432fdcbea6692c14a4aa] | committer: Clément Bœsch

avfilter/showwaves: use INT16_MAX instead of a self defined macro

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

 libavfilter/avf_showwaves.c |    8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/libavfilter/avf_showwaves.c b/libavfilter/avf_showwaves.c
index fa34a52..97d0dbd 100644
--- a/libavfilter/avf_showwaves.c
+++ b/libavfilter/avf_showwaves.c
@@ -178,12 +178,10 @@ static int request_frame(AVFilterLink *outlink)
     return ret;
 }
 
-#define MAX_INT16 ((1<<15) -1)
-
 static void draw_sample_point(uint8_t *buf, int height, int linesize,
                               int16_t sample, int16_t *prev_y, int intensity)
 {
-    const int h = height/2 - av_rescale(sample, height/2, MAX_INT16);
+    const int h = height/2 - av_rescale(sample, height/2, INT16_MAX);
     if (h >= 0 && h < height)
         buf[h * linesize] += intensity;
 }
@@ -192,7 +190,7 @@ static void draw_sample_line(uint8_t *buf, int height, int linesize,
                              int16_t sample, int16_t *prev_y, int intensity)
 {
     int k;
-    const int h = height/2 - av_rescale(sample, height/2, MAX_INT16);
+    const int h = height/2 - av_rescale(sample, height/2, INT16_MAX);
     int start   = height/2;
     int end     = av_clip(h, 0, height-1);
     if (start > end)
@@ -205,7 +203,7 @@ static void draw_sample_p2p(uint8_t *buf, int height, int linesize,
                             int16_t sample, int16_t *prev_y, int intensity)
 {
     int k;
-    const int h = height/2 - av_rescale(sample, height/2, MAX_INT16);
+    const int h = height/2 - av_rescale(sample, height/2, INT16_MAX);
     if (h >= 0 && h < height) {
         buf[h * linesize] += intensity;
         if (*prev_y && h != *prev_y) {



More information about the ffmpeg-cvslog mailing list