RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

video: remove libavutil PSEUDOPAL stuff 

Not needed anymore with newest libavutil.
This commit is contained in:
wm4 2018-04-03 18:01:07 +02:00 committed by Jan Ekström
parent e3e2c794ef
commit c338c0d90a
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
video/img_format.c
View File

@ -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))

3
video/mp_image.c
View File

@ -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);
}

2
wscript
View File

@ -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',