diff options
| author | wm4 <wm4@nowhere> | 2014-01-22 00:30:40 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2014-01-22 00:35:52 +0100 |
| commit | 0931cff1e94009480444f6e9f26f330b9ac8a4ad (patch) | |
| tree | eec9c5252c65b916386b3e93d3c87f6c14ab6427 /video | |
| parent | 38d29c487c2fba8aa0c568b5f2d346498b985e39 (diff) | |
| download | mpv-0931cff1e94009480444f6e9f26f330b9ac8a4ad.tar.bz2 mpv-0931cff1e94009480444f6e9f26f330b9ac8a4ad.tar.xz | |
aspect: remove a small ffmpeg dependency
Not strictly needed, but probably saves us pain the next time
ffmpeg mess up their headers.
Diffstat (limited to 'video')
| -rw-r--r-- | video/out/aspect.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/video/out/aspect.c b/video/out/aspect.c index 38a683a13e..1439f5a5db 100644 --- a/video/out/aspect.c +++ b/video/out/aspect.c @@ -16,8 +16,6 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include <libavutil/common.h> - /* Stuff for correct aspect scaling. */ #include "aspect.h" #include "vo.h" @@ -62,8 +60,8 @@ static void aspect_calc_panscan(struct mp_log *log, struct mp_vo_opts *opts, // Clamp [start, end) to range [0, size) with various fallbacks. static void clamp_size(int size, int *start, int *end) { - *start = FFMAX(0, *start); - *end = FFMIN(size, *end); + *start = MPMAX(0, *start); + *end = MPMIN(size, *end); if (*start >= *end) { *start = 0; *end = 1; |