summaryrefslogtreecommitdiffstats
path: root/vlc/build/vlc-1.0.5_png14.diff
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2010-03-06 16:53:51 +0000
committer Eric Hameleers <alien@slackware.com>2010-03-06 16:53:51 +0000
commit7f69e417de64bba71a3ef68203ee4a1191cd88fe (patch)
tree591cd04a6ea0d3c75382eece59eef40dd5c82bc4 /vlc/build/vlc-1.0.5_png14.diff
parentd36bc2373ace20df25d96e1d2766662b666c80cc (diff)
downloadasb-7f69e417de64bba71a3ef68203ee4a1191cd88fe.tar.gz
asb-7f69e417de64bba71a3ef68203ee4a1191cd88fe.tar.xz
Initial revision
Diffstat (limited to 'vlc/build/vlc-1.0.5_png14.diff')
-rw-r--r--vlc/build/vlc-1.0.5_png14.diff32
1 files changed, 32 insertions, 0 deletions
diff --git a/vlc/build/vlc-1.0.5_png14.diff b/vlc/build/vlc-1.0.5_png14.diff
new file mode 100644
index 00000000..f9dd2d36
--- /dev/null
+++ b/vlc/build/vlc-1.0.5_png14.diff
@@ -0,0 +1,32 @@
+From: Jean-Baptiste Kempf <jb@videolan.org>
+Date: Mon, 15 Feb 2010 22:50:27 +0000 (+0100)
+Subject: Png: compatibility with libpng 1.4
+X-Git-Url: http://git.videolan.org/?p=vlc.git;a=commitdiff_plain;h=ffa6a2fa83452afe6a6ec67c4a3e8a5f1a6aaeef
+
+Png: compatibility with libpng 1.4
+
+Patch probably from arekm -- pld-linux . org
+---
+
+diff --git a/modules/codec/png.c b/modules/codec/png.c
+index 5dd4c2e..acd5694 100644
+--- a/modules/codec/png.c
++++ b/modules/codec/png.c
+@@ -152,7 +152,7 @@ static picture_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
+ p_info = png_create_info_struct( p_png );
+ if( p_info == NULL )
+ {
+- png_destroy_read_struct( &p_png, png_infopp_NULL, png_infopp_NULL );
++ png_destroy_read_struct( &p_png, NULL, NULL );
+ block_Release( p_block ); *pp_block = NULL;
+ return NULL;
+ }
+@@ -160,7 +160,7 @@ static picture_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
+ p_end_info = png_create_info_struct( p_png );
+ if( p_end_info == NULL )
+ {
+- png_destroy_read_struct( &p_png, &p_info, png_infopp_NULL );
++ png_destroy_read_struct( &p_png, &p_info, NULL );
+ block_Release( p_block ); *pp_block = NULL;
+ return NULL;
+ }