diff options
author | wm4 <wm4@nowhere> | 2014-04-19 17:18:10 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2014-04-19 17:18:10 +0200 |
commit | 85998f6121edb44672f51c4745fb243f3c567d3f (patch) | |
tree | 64ff8dd5ed267b9d8e51330ead013ca7ff141564 /video/out/x11_common.c | |
parent | 0cff5836c3f410136e3fdb3e2f9e24bb81dd9a87 (diff) | |
download | mpv-85998f6121edb44672f51c4745fb243f3c567d3f.tar.bz2 mpv-85998f6121edb44672f51c4745fb243f3c567d3f.tar.xz |
Fix some libav* include statements
Fix all include statements of the form:
#include "libav.../..."
These come from MPlayer times, when FFmpeg was somehow part of the
MPlayer build tree, and this form was needed to prefer the local files
over system FFmpeg.
In some cases, the include statement wasn't needed or could be replaced
with mpv defined symbols.
Diffstat (limited to 'video/out/x11_common.c')
-rw-r--r-- | video/out/x11_common.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/video/out/x11_common.c b/video/out/x11_common.c index da8d878b6b..537e1124f1 100644 --- a/video/out/x11_common.c +++ b/video/out/x11_common.c @@ -25,10 +25,10 @@ #include "config.h" #include "bstr/bstr.h" #include "options/options.h" +#include "common/common.h" #include "common/msg.h" #include "input/input.h" #include "input/event.h" -#include "libavutil/common.h" #include "x11_common.h" #include "talloc.h" @@ -1419,10 +1419,10 @@ static void fill_rect(struct vo *vo, GC gc, int x0, int y0, int x1, int y1) { struct vo_x11_state *x11 = vo->x11; - x0 = FFMAX(x0, 0); - y0 = FFMAX(y0, 0); - x1 = FFMIN(x1, x11->win_width); - y1 = FFMIN(y1, x11->win_height); + x0 = MPMAX(x0, 0); + y0 = MPMAX(y0, 0); + x1 = MPMIN(x1, x11->win_width); + y1 = MPMIN(y1, x11->win_height); if (x11->window && x1 > x0 && y1 > y0) XFillRectangle(x11->display, x11->window, gc, x0, y0, x1 - x0, y1 - y0); |