diff options
| author | wm4 <wm4@nowhere> | 2019-10-31 11:24:20 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2019-10-31 11:24:20 +0100 |
| commit | 6d92e5550203b04b7254eb8ffe31734e57070d79 (patch) | |
| tree | fcd9f88cddae110a8a65f9e7ea59703bd79f83c5 /sub/sd_lavc.c | |
| parent | 6fdfa7c9912ff9fda0ada6125bc4fed61b7220ea (diff) | |
| download | mpv-6d92e5550203b04b7254eb8ffe31734e57070d79.tar.bz2 mpv-6d92e5550203b04b7254eb8ffe31734e57070d79.tar.xz | |
Replace uses of FFMIN/MAX with MPMIN/MAX
And remove libavutil includes where possible.
Diffstat (limited to 'sub/sd_lavc.c')
| -rw-r--r-- | sub/sd_lavc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sub/sd_lavc.c b/sub/sd_lavc.c index 72c89913e0..d2e21fbd2b 100644 --- a/sub/sd_lavc.c +++ b/sub/sd_lavc.c @@ -249,8 +249,8 @@ static void read_sub_bitmaps(struct sd *sd, struct sub *sub) b->stride = sub->data->stride[0]; b->bitmap = sub->data->planes[0] + pos.y * b->stride + pos.x * 4; - sub->src_w = FFMAX(sub->src_w, b->x + b->w); - sub->src_h = FFMAX(sub->src_h, b->y + b->h); + sub->src_w = MPMAX(sub->src_w, b->x + b->w); + sub->src_h = MPMAX(sub->src_h, b->y + b->h); assert(r->nb_colors > 0); assert(r->nb_colors <= 256); |