diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-04-07 14:17:39 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-04-07 14:17:39 +0200 |
| commit | 2dd6d1fc82c0563c0b3af90ad4926fa6463c204f (patch) | |
| tree | cea2d78836b0958b0402b42976c4c84ec6e700a8 /package/mplayer/patches/patch-libmpcodecs_vd_mpng_c | |
| parent | c82f34b5a8e2851c2074c1e03263f788eb2c28be (diff) | |
| parent | 3cda7c5f211225fea03a3634daeef9cafd627aa2 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Conflicts:
package/firefox/Makefile
package/jpeg/patches/patch-ltmain_sh
Diffstat (limited to 'package/mplayer/patches/patch-libmpcodecs_vd_mpng_c')
| -rw-r--r-- | package/mplayer/patches/patch-libmpcodecs_vd_mpng_c | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/package/mplayer/patches/patch-libmpcodecs_vd_mpng_c b/package/mplayer/patches/patch-libmpcodecs_vd_mpng_c new file mode 100644 index 000000000..c783ec100 --- /dev/null +++ b/package/mplayer/patches/patch-libmpcodecs_vd_mpng_c @@ -0,0 +1,39 @@ +--- MPlayer-1.0rc4.orig/libmpcodecs/vd_mpng.c 2010-02-26 16:01:37.000000000 +0100 ++++ MPlayer-1.0rc4/libmpcodecs/vd_mpng.c 2011-04-01 16:23:04.381818599 +0200 +@@ -74,7 +74,7 @@ static int pngLength; + + static void pngReadFN( png_structp pngstr,png_bytep buffer,png_size_t size ) + { +- char * p = pngstr->io_ptr; ++ char * p = png_get_io_ptr(pngstr); + if(size>pngLength-pngPointer && pngLength>=pngPointer) size=pngLength-pngPointer; + fast_memcpy( buffer,(char *)&p[pngPointer],size ); + pngPointer+=size; +@@ -90,6 +90,7 @@ static mp_image_t* decode(sh_video_t *sh + png_uint_32 png_width=0,png_height=0; + int depth,color; + png_uint_32 i; ++ png_byte color_type; + mp_image_t* mpi; + + int cols; +@@ -111,7 +112,9 @@ static mp_image_t* decode(sh_video_t *sh + png_get_IHDR( png,info,&png_width,&png_height,&depth,&color,NULL,NULL,NULL ); + png_set_bgr( png ); + +- switch( info->color_type ) { ++ color_type=png_get_color_type(png, info); ++ ++ switch( color_type ) { + case PNG_COLOR_TYPE_GRAY_ALPHA: + mp_msg( MSGT_DECVIDEO,MSGL_INFO,"Sorry gray scaled png with alpha channel not supported at moment.\n" ); + break; +@@ -128,7 +131,7 @@ static mp_image_t* decode(sh_video_t *sh + out_fmt=IMGFMT_BGR24; + break; + default: +- mp_msg( MSGT_DECVIDEO,MSGL_INFO,"Sorry, unsupported PNG colorspace: %d.\n" ,info->color_type); ++ mp_msg( MSGT_DECVIDEO,MSGL_INFO,"Sorry, unsupported PNG colorspace: %d.\n" ,color_type); + } + + // (re)init libvo if image parameters changed (width/height/colorspace) |