aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorClément Bœsch <u@pkh.me>2014-12-24 15:11:23 +0100
committerClément Bœsch <u@pkh.me>2014-12-24 15:13:31 +0100
commitf6950a077cd4a274f3c3432fdcbea6692c14a4aa (patch)
tree642229024d048254fce75dfde2f2430769617cf8
parent96dce6f7ceaa8d3c7eddd241213bec82e84e7f7a (diff)
downloadffmpeg-f6950a077cd4a274f3c3432fdcbea6692c14a4aa.tar.gz
avfilter/showwaves: use INT16_MAX instead of a self defined macro
-rw-r--r--libavfilter/avf_showwaves.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/libavfilter/avf_showwaves.c b/libavfilter/avf_showwaves.c
index fa34a52dc5..97d0dbd232 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) {