From 2514421c13f58b153f31cca62251ebec8af54ba4 Mon Sep 17 00:00:00 2001 From: David Hoyt Date: Tue, 2 Feb 2010 00:02:34 +0000 Subject: [PATCH] png: fix compilation with libpng 1.4 png_set_gray_1_2_4_to_8() has been deprecated for a while and was finally removed in libpng 1.4.x. Use png_set_expand_gray_1_2_4_to_8() instead. Fixes #608629. --- ext/libpng/gstpngdec.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ext/libpng/gstpngdec.c b/ext/libpng/gstpngdec.c index dde459db75..9c4f9a3df2 100644 --- a/ext/libpng/gstpngdec.c +++ b/ext/libpng/gstpngdec.c @@ -397,7 +397,11 @@ gst_pngdec_caps_create_and_set (GstPngDec * pngdec) png_set_gray_to_rgb (pngdec->png); if (bpc < 8) { /* Convert to 8 bits */ GST_LOG_OBJECT (pngdec, "converting grayscale image to 8 bits"); +#if PNG_LIBPNG_VER < 10400 png_set_gray_1_2_4_to_8 (pngdec->png); +#else + png_set_expand_gray_1_2_4_to_8 (pngdec->png); +#endif } }