diff options
author | wm4 <wm4@nowhere> | 2019-10-20 17:28:48 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2019-10-20 19:41:18 +0200 |
commit | ff67fbf328b32202f9fea8223f73c6dbcb44eca2 (patch) | |
tree | e1442f2b2d96b0dd59cd2ab95fdf973481159b3d | |
parent | 027ca4fb855f3dff4cba1c907c92c509b82e6fe8 (diff) | |
download | mpv-ff67fbf328b32202f9fea8223f73c6dbcb44eca2.tar.bz2 mpv-ff67fbf328b32202f9fea8223f73c6dbcb44eca2.tar.xz |
build: lower required FFmpeg version
The FFmpeg version was last bumped a long time ago, except in commit
1638fa7b4663e4ad46ccd9750, where it was used for some obscure pixel
format.
This is pretty annoying, so make it optional.
-rw-r--r-- | video/fmt-conversion.c | 2 | ||||
-rw-r--r-- | wscript | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/video/fmt-conversion.c b/video/fmt-conversion.c index 6e298d0057..72f4407e70 100644 --- a/video/fmt-conversion.c +++ b/video/fmt-conversion.c @@ -35,7 +35,9 @@ static const struct { {IMGFMT_RGB24, AV_PIX_FMT_RGB24}, {IMGFMT_UYVY, AV_PIX_FMT_UYVY422}, {IMGFMT_NV12, AV_PIX_FMT_NV12}, +#if LIBAVUTIL_VERSION_MICRO >= 100 && LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(56, 27, 0) {IMGFMT_NV24, AV_PIX_FMT_NV24}, +#endif {IMGFMT_Y8, AV_PIX_FMT_GRAY8}, {IMGFMT_Y16, AV_PIX_FMT_GRAY16}, {IMGFMT_420P, AV_PIX_FMT_YUV420P}, @@ -424,7 +424,7 @@ iconv support use --disable-iconv.", ] ffmpeg_pkg_config_checks = [ - 'libavutil', '>= 56.27.100', + 'libavutil', '>= 56.12.100', 'libavcodec', '>= 58.16.100', 'libavformat', '>= 58.9.100', 'libswscale', '>= 5.0.101', |