Mercurial > mplayer.hg
changeset 3950:e92653caf5d7
osd support, zlib range fix. by Kim Minh Kaplan <kmkaplan@selfoffice.com>
| author | arpi |
|---|---|
| date | Wed, 02 Jan 2002 17:50:03 +0000 |
| parents | 2a114488e3ca |
| children | 50be9c235764 |
| files | libvo/vo_png.c |
| diffstat | 1 files changed, 6 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/libvo/vo_png.c Wed Jan 02 17:49:25 2002 +0000 +++ b/libvo/vo_png.c Wed Jan 02 17:50:03 2002 +0000 @@ -56,6 +56,10 @@ enum {OK,ERROR} status; }; +static void draw_alpha(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride){ + vo_draw_alpha_rgb24(w, h, src, srca, stride, image_data + 3 * (y0 * image_width + x0), 3 * image_width); +} + static uint32_t init(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t fullscreen, char *title, uint32_t format) { @@ -84,7 +88,7 @@ return 1; } - if((z_compression < 0) || (z_compression < 9)) { + if((z_compression >= 0) && (z_compression <= 9)) { if(z_compression == 0) { printf("PNG Warning: compression level set to 0, compression disabled!\n"); printf("PNG Info: Use the -z <n> switch to set compression level from 0 to 9.\n"); @@ -223,6 +227,7 @@ static void draw_osd(void) { + vo_draw_text(image_width, image_height, draw_alpha); } static void flip_page (void)