diff options
| author | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-01-02 17:50:03 +0000 |
|---|---|---|
| committer | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-01-02 17:50:03 +0000 |
| commit | 556b0dbdbcdba8702c8edb55ccec9b634769abb5 (patch) | |
| tree | a2b0207031ecd0ff99c9daac31a18b48505a662f /libvo | |
| parent | 08d8c3b181c1a18b8969b467fa451e65c19ed204 (diff) | |
| download | mpv-556b0dbdbcdba8702c8edb55ccec9b634769abb5.tar.bz2 mpv-556b0dbdbcdba8702c8edb55ccec9b634769abb5.tar.xz | |
osd support, zlib range fix. by Kim Minh Kaplan <kmkaplan@selfoffice.com>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3951 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo')
| -rw-r--r-- | libvo/vo_png.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/libvo/vo_png.c b/libvo/vo_png.c index 26b1e1e1ef..fb01c7ffe8 100644 --- a/libvo/vo_png.c +++ b/libvo/vo_png.c @@ -56,6 +56,10 @@ struct pngdata { 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 @@ init(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint3 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 uint32_t draw_frame(uint8_t * src[]) static void draw_osd(void) { + vo_draw_text(image_width, image_height, draw_alpha); } static void flip_page (void) |