diff options
author | wm4 <wm4@nowhere> | 2018-04-03 18:01:07 +0200 |
---|---|---|
committer | Jan Ekström <jeebjp@gmail.com> | 2018-04-03 20:08:15 +0300 |
commit | c338c0d90a78d1b93bd3361b464cfd562223fb9d (patch) | |
tree | 0005a8a39f5b93570d142226048d21f391d92ae5 /video | |
parent | e3e2c794efcff035615ac93f8a4cd9ab2cef4d97 (diff) | |
download | mpv-c338c0d90a78d1b93bd3361b464cfd562223fb9d.tar.bz2 mpv-c338c0d90a78d1b93bd3361b464cfd562223fb9d.tar.xz |
video: remove libavutil PSEUDOPAL stuff
Not needed anymore with newest libavutil.
Diffstat (limited to 'video')
-rw-r--r-- | video/img_format.c | 4 | ||||
-rw-r--r-- | video/mp_image.c | 3 |
2 files changed, 2 insertions, 5 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); } |