1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
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;
}
|
