diff options
| author |   Eric Hameleers <alien@slackware.com> | 2010-03-13 21:44:34 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2010-03-13 21:44:34 +0000 |
| commit | 7625f715063b628f40d03b71678d2535be2e7fac (patch) | |
| tree | ae99b83808ece95fd1530fde42cbfbf750ca19f3 /vlc/build/vlc_png14.diff | |
| parent | 3b287956f6b430780abc9d3bb5be4f8b9b2b51f0 (diff) | |
| download | asb-7625f715063b628f40d03b71678d2535be2e7fac.tar.gz asb-7625f715063b628f40d03b71678d2535be2e7fac.tar.xz | |
Initial revision
Diffstat (limited to 'vlc/build/vlc_png14.diff')
| -rw-r--r-- | vlc/build/vlc_png14.diff | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/vlc/build/vlc_png14.diff b/vlc/build/vlc_png14.diff new file mode 100644 index 00000000..3d6d95ef --- /dev/null +++ b/vlc/build/vlc_png14.diff @@ -0,0 +1,33 @@ +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; + } + |