projects
/
platform
/
upstream
/
gst-plugins-good.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c35a984
)
png: fix compilation with libpng 1.4
author
David Hoyt
<dhoyt@llnl.gov>
Tue, 2 Feb 2010 00:02:34 +0000
(
00:02
+0000)
committer
Tim-Philipp Müller
<tim.muller@collabora.co.uk>
Tue, 2 Feb 2010 00:04:34 +0000
(
00:04
+0000)
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
patch
|
blob
|
history
diff --git
a/ext/libpng/gstpngdec.c
b/ext/libpng/gstpngdec.c
index
dde459d
..
9c4f9a3
100644
(file)
--- 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
}
}