diff options
Diffstat (limited to 'common')
| -rw-r--r-- | common/common.c | 16 | ||||
| -rw-r--r-- | common/encode_lavc.c | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/common/common.c b/common/common.c index e8a100dcc4..d0b2382b78 100644 --- a/common/common.c +++ b/common/common.c @@ -96,10 +96,10 @@ char *mp_format_time(double time, bool fractions) // Set rc to the union of rc and rc2 void mp_rect_union(struct mp_rect *rc, const struct mp_rect *rc2) { - rc->x0 = FFMIN(rc->x0, rc2->x0); - rc->y0 = FFMIN(rc->y0, rc2->y0); - rc->x1 = FFMAX(rc->x1, rc2->x1); - rc->y1 = FFMAX(rc->y1, rc2->y1); + rc->x0 = MPMIN(rc->x0, rc2->x0); + rc->y0 = MPMIN(rc->y0, rc2->y0); + rc->x1 = MPMAX(rc->x1, rc2->x1); + rc->y1 = MPMAX(rc->y1, rc2->y1); } // Returns whether or not a point is contained by rc @@ -112,10 +112,10 @@ bool mp_rect_contains(struct mp_rect *rc, int x, int y) // Return false if the result is empty. bool mp_rect_intersection(struct mp_rect *rc, const struct mp_rect *rc2) { - rc->x0 = FFMAX(rc->x0, rc2->x0); - rc->y0 = FFMAX(rc->y0, rc2->y0); - rc->x1 = FFMIN(rc->x1, rc2->x1); - rc->y1 = FFMIN(rc->y1, rc2->y1); + rc->x0 = MPMAX(rc->x0, rc2->x0); + rc->y0 = MPMAX(rc->y0, rc2->y0); + rc->x1 = MPMIN(rc->x1, rc2->x1); + rc->y1 = MPMIN(rc->y1, rc2->y1); return rc->x1 > rc->x0 && rc->y1 > rc->y0; } diff --git a/common/encode_lavc.c b/common/encode_lavc.c index 968ced280c..8066173d1c 100644 --- a/common/encode_lavc.c +++ b/common/encode_lavc.c @@ -720,7 +720,7 @@ int encode_lavc_getstatus(struct encode_lavc_context *ctx, double now = mp_time_sec(); float minutes, megabytes, fps, x; - float f = FFMAX(0.0001, relative_position); + float f = MPMAX(0.0001, relative_position); pthread_mutex_lock(&ctx->lock); |