avfilter/vf_frei0r: also set AVFilterLink.frame_rate

[ffmpeg] / libavfilter / avf_showwaves.c

diff --git a/libavfilter/avf_showwaves.c b/libavfilter/avf_showwaves.c
index fa34a52dc5815096f77cd4017c39412d7d3edf6a..cffa883003a155a771eec295dd47065fe3f38a03 100644 (file)
--- 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) {
@@ -224,7 +222,7 @@ static void draw_sample_cline(uint8_t *buf, int height, int linesize,
                               int16_t sample, int16_t *prev_y, int intensity)
 {
     int k;
-    const int h     = av_rescale(abs(sample), height, UINT16_MAX);
+    const int h     = av_rescale(abs(sample), height, INT16_MAX);
     const int start = (height - h) / 2;
     const int end   = start + h;
     for (k = start; k < end; k++)