[vlc-devel] commit: Png: compatibility with libpng 1.4 (Jean-Baptiste Kempf )

git version control git at videolan.org
Mon Feb 15 23:53:28 CET 2010


vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Mon Feb 15 23:50:27 2010 +0100| [ffa6a2fa83452afe6a6ec67c4a3e8a5f1a6aaeef] | committer: Jean-Baptiste Kempf 

Png: compatibility with libpng 1.4

Patch probably from arekm -- pld-linux . org

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=ffa6a2fa83452afe6a6ec67c4a3e8a5f1a6aaeef
---

 modules/codec/png.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

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;
     }




More information about the vlc-devel mailing list