From f30c2c99d16527c045caee90c9f7b2a7a7c85c00 Mon Sep 17 00:00:00 2001 From: wm4 Date: Sun, 1 Dec 2013 20:45:44 +0100 Subject: mp_image: deal with FFmpeg PSEUDOPAL braindeath We got a crash in libavutil when encoding with Y8 (GRAY8). The reason was that libavutil was copying an Y8 image allocated by us, and expected a palette. This is because GRAY8 is a PSEUDOPAL format. It's not clear what PSEUDOPAL means, and it makes literally no sense at all. However, it does expect a palette allocated for some formats that are not paletted, and libavutil crashed when trying to access the non-existent palette. --- video/mp_image.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'video/mp_image.c') diff --git a/video/mp_image.c b/video/mp_image.c index 242e09e2d0..b0f174d769 100644 --- a/video/mp_image.c +++ b/video/mp_image.c @@ -132,7 +132,7 @@ static void mp_image_alloc_planes(struct mp_image *mpi) mpi->stride[n] = FFALIGN(line_bytes, SWS_MIN_BYTE_ALIGN); plane_size[n] = mpi->stride[n] * alloc_h; } - if (mpi->imgfmt == IMGFMT_PAL8) + if (mpi->fmt.flags & MP_IMGFLAG_PAL) plane_size[1] = MP_PALETTE_SIZE; size_t sum = 0; @@ -330,7 +330,7 @@ void mp_image_copy(struct mp_image *dst, struct mp_image *src) memcpy_pic(dst->planes[n], src->planes[n], line_bytes, dst->plane_h[n], dst->stride[n], src->stride[n]); } - if (dst->imgfmt == IMGFMT_PAL8) + if (dst->fmt.flags & MP_IMGFLAG_PAL) memcpy(dst->planes[1], src->planes[1], MP_PALETTE_SIZE); } @@ -349,7 +349,7 @@ void mp_image_copy_attributes(struct mp_image *dst, struct mp_image *src) dst->levels = src->levels; dst->chroma_location = src->chroma_location; } - if (dst->imgfmt == IMGFMT_PAL8 && src->imgfmt == IMGFMT_PAL8) { + if ((dst->fmt.flags & MP_IMGFLAG_PAL) && (src->fmt.flags & MP_IMGFLAG_PAL)) { if (dst->planes[1] && src->planes[1]) memcpy(dst->planes[1], src->planes[1], MP_PALETTE_SIZE); } -- cgit v1.2.3