Changed : merge with Beliyaal branch

Added : support for madVR (new Video Renderer)

git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@1048 10f7b99b-c216-0410-bff0-8a66a9350fd8

1 files changed, 22 insertions, 22 deletions

diff --git a/src/apps/mplayerc/libpng.c b/src/apps/mplayerc/libpng.c
index 82e15960e..14b987896 100644
--- a/src/apps/mplayerc/libpng.c
+++ b/src/apps/mplayerc/libpng.c
@@ -45,8 +45,8 @@ unsigned char* DecompressPNG(struct png_t* png, int* w, int* h)
 	unsigned char* row;

 	unsigned int x, y, c;

 

-	if(png_sig_cmp(png->data, 0, 8) != 0) 
-		return NULL;
+	if(png_sig_cmp(png->data, 0, 8) != 0) 

+		return NULL;

 

 	png->pos = 8;

 

@@ -57,25 +57,25 @@ unsigned char* DecompressPNG(struct png_t* png, int* w, int* h)
 

     png_set_read_fn(png_ptr, (png_voidp)png, read_data_fn);

 

-    info_ptr = png_create_info_struct(png_ptr);
-    if(!info_ptr)
-    {
-        png_destroy_read_struct(&png_ptr, (png_infopp)NULL, (png_infopp)NULL);
-        return NULL;
-    }
-

-    end_info = png_create_info_struct(png_ptr);
-    if(!end_info)
-    {
-        png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
-        return NULL;
-    }
-

-    if(setjmp(png_jmpbuf(png_ptr)))
-    {
-        png_destroy_read_struct(&png_ptr, &info_ptr, &end_info);
-        return NULL;
-    }
+    info_ptr = png_create_info_struct(png_ptr);

+    if(!info_ptr)

+    {

+        png_destroy_read_struct(&png_ptr, (png_infopp)NULL, (png_infopp)NULL);

+        return NULL;

+    }

+

+    end_info = png_create_info_struct(png_ptr);

+    if(!end_info)

+    {

+        png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);

+        return NULL;

+    }

+

+    if(setjmp(png_jmpbuf(png_ptr)))

+    {

+        png_destroy_read_struct(&png_ptr, &info_ptr, &end_info);

+        return NULL;

+    }

 

 	png_set_sig_bytes(png_ptr, 8);

 

@@ -90,7 +90,7 @@ unsigned char* DecompressPNG(struct png_t* png, int* w, int* h)
 

 	if(png_get_channels(png_ptr, info_ptr) != 3) 

 	{

-        png_destroy_read_struct(&png_ptr, &info_ptr, &end_info);
+        png_destroy_read_struct(&png_ptr, &info_ptr, &end_info);

 		return NULL;

 	}