From c984f807703fb113c3e53d9a61d38e1cc83bf196 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 12 Mar 2019 23:16:03 +0000 Subject: Fix R/B swap with as_png(); support as_png() for any pixel format. --- src/lib/image.cc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/lib') diff --git a/src/lib/image.cc b/src/lib/image.cc index f005e3f63..95cb93b65 100644 --- a/src/lib/image.cc +++ b/src/lib/image.cc @@ -1248,7 +1248,9 @@ Image::as_png () const { DCPOMATIC_ASSERT (bytes_per_pixel(0) == 4); DCPOMATIC_ASSERT (planes() == 1); - DCPOMATIC_ASSERT (pixel_format() == AV_PIX_FMT_BGRA); + if (pixel_format() != AV_PIX_FMT_RGBA) { + return convert_pixel_format(dcp::YUV_TO_RGB_REC709, AV_PIX_FMT_RGBA, true, false)->as_png(); + } /* error handling? */ png_structp png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, reinterpret_cast(const_cast(this)), png_error_fn, 0); -- cgit v1.2.3