[SCM] gmerlin/master: remove (accidental) double call to (deprecated) png_set_gray...()

[zmoelnig-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit ab5f16e74c54071acc4909dae298e1588cc68eb2
Author: IOhannes m zmölnig <zmoelnig at iem.at>
Date:   Tue Jan 11 10:17:35 2011 +0100

    remove (accidental) double call to (deprecated) png_set_gray...()

diff --git a/debian/patches/png_set_gray.patch b/debian/patches/png_set_gray.patch
new file mode 100644
index 0000000..ccef076
--- /dev/null
+++ b/debian/patches/png_set_gray.patch
@@ -0,0 +1,13 @@
+Author: Cristian Morales Vega <reddwarf at opensuse.org>
+Description: remove double call to (deprecated) png_set_gray_1_2_4_to_8()
+
+--- gmerlin.orig/plugins/png/ir_png.c
++++ gmerlin/plugins/png/ir_png.c
+@@ -133,7 +133,6 @@
+       png_set_expand_gray_1_2_4_to_8(png->png_ptr);
+ #endif
+ 
+-        png_set_gray_1_2_4_to_8(png->png_ptr);
+       if (png_get_valid(png->png_ptr, png->info_ptr, PNG_INFO_tRNS))
+         {
+         png_set_tRNS_to_alpha(png->png_ptr);
diff --git a/debian/patches/series b/debian/patches/series
index b14bb54..e9c1206 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 remove_desktop_encoding_key.patch
 fix_manpages.patch
 replace_bg_sem_h.patch
+png_set_gray.patch

-- 
gmerlin packaging