summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2018-04-03 18:01:07 +0200
committerJan Ekström <jeebjp@gmail.com>2018-04-03 20:08:15 +0300
commitc338c0d90a78d1b93bd3361b464cfd562223fb9d (patch)
tree0005a8a39f5b93570d142226048d21f391d92ae5
parente3e2c794efcff035615ac93f8a4cd9ab2cef4d97 (diff)
downloadmpv-c338c0d90a78d1b93bd3361b464cfd562223fb9d.tar.bz2
mpv-c338c0d90a78d1b93bd3361b464cfd562223fb9d.tar.xz
video: remove libavutil PSEUDOPAL stuff
Not needed anymore with newest libavutil.
-rw-r--r--video/img_format.c4
-rw-r--r--video/mp_image.c3
-rw-r--r--wscript2
3 files changed, 3 insertions, 6 deletions
diff --git a/video/img_format.c b/video/img_format.c
index 42c5c9f5ca..f7790aa290 100644
--- a/video/img_format.c
+++ b/video/img_format.c
@@ -212,9 +212,7 @@ struct mp_imgfmt_desc mp_imgfmt_get_desc(int mpfmt)
desc.bytes[p] = desc.bpp[p] / 8;
}
- // PSEUDOPAL is a complete braindeath nightmare, however it seems various
- // parts of FFmpeg expect that it has a palette allocated.
- if (pd->flags & (AV_PIX_FMT_FLAG_PAL | AV_PIX_FMT_FLAG_PSEUDOPAL))
+ if (pd->flags & AV_PIX_FMT_FLAG_PAL)
desc.flags |= MP_IMGFLAG_PAL;
if ((desc.flags & (MP_IMGFLAG_YUV | MP_IMGFLAG_RGB))
diff --git a/video/mp_image.c b/video/mp_image.c
index a78aa19373..6ab3b87150 100644
--- a/video/mp_image.c
+++ b/video/mp_image.c
@@ -478,8 +478,7 @@ static void mp_image_copy_cb(struct mp_image *dst, struct mp_image *src,
memcpy_pic_cb(dst->planes[n], src->planes[n], line_bytes, plane_h,
dst->stride[n], src->stride[n], cpy);
}
- // Watch out for AV_PIX_FMT_FLAG_PSEUDOPAL retardation
- if ((dst->fmt.flags & MP_IMGFLAG_PAL) && dst->planes[1] && src->planes[1])
+ if (dst->fmt.flags & MP_IMGFLAG_PAL)
memcpy(dst->planes[1], src->planes[1], AVPALETTE_SIZE);
}
diff --git a/wscript b/wscript
index 442dfc2de9..0701317f7b 100644
--- a/wscript
+++ b/wscript
@@ -412,7 +412,7 @@ iconv support use --disable-iconv.",
]
ffmpeg_pkg_config_checks = [
- 'libavutil', '>= 56.8.100',
+ 'libavutil', '>= 56.12.100',
'libavcodec', '>= 58.16.100',
'libavformat', '>= 58.9.100',
'libswscale', '>= 5.0.101',