mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2025-02-06 14:53:23 +00:00
lavfi/af_afir,af_aiir: Remove a variable that is always -1.
Fixes two warnings: libavfilter/af_afir.c:194:45: warning: assuming signed overflow does not occur when assuming that (X - c) > X is always false [-Wstrict-overflow] int dx = FFABS(x1-x0), sx = x0 < x1 ? 1 : -1; ~~~~~~~~~~~~^~~~ libavfilter/af_aiir.c:689:45: warning: assuming signed overflow does not occur when assuming that (X - c) > X is always false [-Wstrict-overflow] int dx = FFABS(x1-x0), sx = x0 < x1 ? 1 : -1; ~~~~~~~~~~~~^~~~
This commit is contained in:
parent
b23c4a9dbd
commit
9cb3d8fcb7
@ -191,7 +191,7 @@ static void drawtext(AVFrame *pic, int x, int y, const char *txt, uint32_t color
|
|||||||
|
|
||||||
static void draw_line(AVFrame *out, int x0, int y0, int x1, int y1, uint32_t color)
|
static void draw_line(AVFrame *out, int x0, int y0, int x1, int y1, uint32_t color)
|
||||||
{
|
{
|
||||||
int dx = FFABS(x1-x0), sx = x0 < x1 ? 1 : -1;
|
int dx = FFABS(x1-x0);
|
||||||
int dy = FFABS(y1-y0), sy = y0 < y1 ? 1 : -1;
|
int dy = FFABS(y1-y0), sy = y0 < y1 ? 1 : -1;
|
||||||
int err = (dx>dy ? dx : -dy) / 2, e2;
|
int err = (dx>dy ? dx : -dy) / 2, e2;
|
||||||
|
|
||||||
@ -205,7 +205,7 @@ static void draw_line(AVFrame *out, int x0, int y0, int x1, int y1, uint32_t col
|
|||||||
|
|
||||||
if (e2 >-dx) {
|
if (e2 >-dx) {
|
||||||
err -= dy;
|
err -= dy;
|
||||||
x0 += sx;
|
x0--;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (e2 < dy) {
|
if (e2 < dy) {
|
||||||
|
@ -686,7 +686,7 @@ static void drawtext(AVFrame *pic, int x, int y, const char *txt, uint32_t color
|
|||||||
|
|
||||||
static void draw_line(AVFrame *out, int x0, int y0, int x1, int y1, uint32_t color)
|
static void draw_line(AVFrame *out, int x0, int y0, int x1, int y1, uint32_t color)
|
||||||
{
|
{
|
||||||
int dx = FFABS(x1-x0), sx = x0 < x1 ? 1 : -1;
|
int dx = FFABS(x1-x0);
|
||||||
int dy = FFABS(y1-y0), sy = y0 < y1 ? 1 : -1;
|
int dy = FFABS(y1-y0), sy = y0 < y1 ? 1 : -1;
|
||||||
int err = (dx>dy ? dx : -dy) / 2, e2;
|
int err = (dx>dy ? dx : -dy) / 2, e2;
|
||||||
|
|
||||||
@ -700,7 +700,7 @@ static void draw_line(AVFrame *out, int x0, int y0, int x1, int y1, uint32_t col
|
|||||||
|
|
||||||
if (e2 >-dx) {
|
if (e2 >-dx) {
|
||||||
err -= dy;
|
err -= dy;
|
||||||
x0 += sx;
|
x0--;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (e2 < dy) {
|
if (e2 < dy) {
|
||||||
|
Loading…
Reference in New Issue
Block a user