Mercurial > mplayer.hg
changeset 612:77e0094f0cce
some warnings killed
| author | szabii |
|---|---|
| date | Tue, 24 Apr 2001 10:21:12 +0000 |
| parents | a188733d60de |
| children | 7b522fdaf92e |
| files | libvo/vo_dga.c libvo/vo_fsdga.c libvo/vo_gl.c libvo/vo_mga.c libvo/vo_odivx.c libvo/vo_png.c libvo/vo_sdl.c libvo/vo_svga.c libvo/vo_x11.c libvo/vo_xmga.c libvo/vo_xv.c |
| diffstat | 11 files changed, 79 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/libvo/vo_dga.c Tue Apr 24 05:58:09 2001 +0000 +++ b/libvo/vo_dga.c Tue Apr 24 10:21:12 2001 +0000 @@ -23,6 +23,9 @@ * - works only on x86 architectures * * $Log$ + * Revision 1.16 2001/04/24 10:21:12 szabii + * some warnings killed + * * Revision 1.15 2001/04/19 21:39:10 arpi_esp * driver info now depends on detected DGA version * @@ -274,6 +277,18 @@ //--------------------------------------------------------- +extern void vo_draw_alpha_rgb24(int w,int h, unsigned char* src, + unsigned char *srca, int srcstride, unsigned char* dstbase, + int dststride); +extern void vo_draw_alpha_rgb32(int w,int h, unsigned char* src, + unsigned char *srca, int srcstride, unsigned char* dstbase, + int dststride); +extern void vo_draw_alpha_rgb15(int w,int h, unsigned char* src, + unsigned char *srca, int srcstride, unsigned char* dstbase, + int dststride); +extern void vo_draw_alpha_rgb16(int w,int h, unsigned char* src, + unsigned char *srca, int srcstride, unsigned char* dstbase, + int dststride); static void draw_alpha( int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride ){ @@ -359,6 +374,10 @@ //--------------------------------------------------------- +extern void vo_draw_text(int dxs,int dys,void (*draw_alpha)(int x0,int y0, + int w,int h, unsigned char* src, unsigned char *srca, + int stride)); + static void flip_page( void ){ if(vo_dga_src_format ==IMGFMT_YV12 ){
--- a/libvo/vo_fsdga.c Tue Apr 24 05:58:09 2001 +0000 +++ b/libvo/vo_fsdga.c Tue Apr 24 10:21:12 2001 +0000 @@ -281,7 +281,7 @@ printf("vo_dga: query_format\n"); if( !vo_init() ) return 0; // Can't open X11 - printf("Format: %lx\n", format); + printf("Format: %lx\n", (unsigned long) format); if( format==IMGFMT_YV12 ) return 1; if( ( format&IMGFMT_BGR_MASK )==IMGFMT_BGR && @@ -341,7 +341,7 @@ vo_dga_src_height = height; vo_dga_bpp = (vo_depthonscreen+7) >> 3; - printf("vo_dga: bytes/line: %d, screen res: %dx%d, depth: %d, base: %08x, bpp: %d\n", + printf("vo_dga: bytes/line: %d, screen res: %dx%d, depth: %d, base: %p, bpp: %d\n", vo_dga_width, vo_dga_vp_width, vo_dga_vp_height, vo_depthonscreen, vo_dga_base, vo_dga_bpp);
--- a/libvo/vo_gl.c Tue Apr 24 05:58:09 2001 +0000 +++ b/libvo/vo_gl.c Tue Apr 24 10:21:12 2001 +0000 @@ -79,7 +79,7 @@ static uint32_t texture_width; static uint32_t texture_height; -static resize(int x,int y){ +static void resize(int x,int y){ printf("Resize: %dx%d\n",x,y); glViewport( 0, 0, x, y );
--- a/libvo/vo_mga.c Tue Apr 24 05:58:09 2001 +0000 +++ b/libvo/vo_mga.c Tue Apr 24 10:21:12 2001 +0000 @@ -111,6 +111,9 @@ printf("vo: uninit!\n"); } +extern void vo_draw_text(int dxs,int dys,void (*draw_alpha)(int x0,int y0, + int w,int h, unsigned char* src, unsigned char *srca, + int stride)); static void flip_page(void) {
--- a/libvo/vo_odivx.c Tue Apr 24 05:58:09 2001 +0000 +++ b/libvo/vo_odivx.c Tue Apr 24 10:21:12 2001 +0000 @@ -152,7 +152,7 @@ enc_frame.length=0; encore(0x123,0,&enc_frame,&enc_result); -printf("coded length: %d \n",enc_frame.length); +printf("coded length: %ld \n",enc_frame.length); if(encode_name){ AVIINDEXENTRY i;
--- a/libvo/vo_png.c Tue Apr 24 05:58:09 2001 +0000 +++ b/libvo/vo_png.c Tue Apr 24 10:21:12 2001 +0000 @@ -12,6 +12,7 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> +#include <errno.h> #include <png.h> //#include "/usr/include/png.h" @@ -146,7 +147,7 @@ png.fp = fopen (fname, "wb"); if (png.fp == NULL) { - printf("\nPNG Error opening %s for writing!\n"); + printf("\nPNG Error opening %s for writing!\n", strerror(errno)); png.status = ERROR; return png; }
--- a/libvo/vo_sdl.c Tue Apr 24 05:58:09 2001 +0000 +++ b/libvo/vo_sdl.c Tue Apr 24 10:21:12 2001 +0000 @@ -445,7 +445,7 @@ if(verbose) printf("SDL: setting zoomed fullscreen without modeswitching\n"); priv->windowsize.w = d_width; priv->windowsize.h = d_height; - if(priv->surface = SDL_SetVideoMode (d_width, d_height, priv->bpp, priv->sdlfullflags)) + if((priv->surface = SDL_SetVideoMode (d_width, d_height, priv->bpp, priv->sdlfullflags))) SDL_ShowCursor(0); break; case 0x02: @@ -710,6 +710,10 @@ * returns : doesn't return **/ +extern void vo_draw_text(int dxs,int dys,void (*draw_alpha)(int x0,int y0, + int w,int h, unsigned char* src, unsigned char *srca, + int stride)); + static void flip_page (void) { struct sdl_priv_s *priv = &sdl_priv;
--- a/libvo/vo_svga.c Tue Apr 24 05:58:09 2001 +0000 +++ b/libvo/vo_svga.c Tue Apr 24 10:21:12 2001 +0000 @@ -418,6 +418,20 @@ return (&vo_info); } +extern void vo_draw_alpha_rgb24(int w,int h, unsigned char* src, + unsigned char *srca, int srcstride, unsigned char* dstbase, + int dststride); +extern void vo_draw_alpha_rgb32(int w,int h, unsigned char* src, + unsigned char *srca, int srcstride, unsigned char* dstbase, + int dststride); +extern void vo_draw_alpha_rgb15(int w,int h, unsigned char* src, + unsigned char *srca, int srcstride, unsigned char* dstbase, + int dststride); +extern void vo_draw_alpha_rgb16(int w,int h, unsigned char* src, + unsigned char *srca, int srcstride, unsigned char* dstbase, + int dststride); + + static void draw_alpha(int x0, int y0, int w, int h, unsigned char *src, unsigned char *srca, int stride) { switch (bpp) { @@ -481,6 +495,7 @@ src[0] = bppbuf; } gl_putbox(x_pos, y_pos, maxw, maxh, src[0]); + return 0; } static uint32_t draw_slice(uint8_t *image[], int stride[], @@ -497,8 +512,13 @@ src = scalebuf; } gl_putbox((int)(x * scaling) + x_pos, (int)(y * scaling) + y_pos, sw, sh, src); + return 0; } +extern void vo_draw_text(int dxs,int dys,void (*draw_alpha)(int x0,int y0, + int w,int h, unsigned char* src, unsigned char *srca, + int stride)); + static void flip_page(void) { if (y_pos) { gl_fillbox(0, 0, WIDTH, y_pos, 0); @@ -536,4 +556,4 @@ free(modelist); } } - \ No newline at end of file +
--- a/libvo/vo_x11.c Tue Apr 24 05:58:09 2001 +0000 +++ b/libvo/vo_x11.c Tue Apr 24 10:21:12 2001 +0000 @@ -319,7 +319,7 @@ bpp=myximage->bits_per_pixel; - fprintf( stderr,"X11 color mask: R:%X G:%X B:%X\n",myximage->red_mask,myximage->green_mask,myximage->blue_mask ); + fprintf( stderr,"X11 color mask: R:%lX G:%lX B:%lX\n",myximage->red_mask,myximage->green_mask,myximage->blue_mask ); // If we have blue in the lowest bit then obviously RGB mode=( ( myximage->blue_mask & 0x01 ) != 0 ) ? MODE_RGB : MODE_BGR; @@ -387,6 +387,19 @@ #endif } +extern void vo_draw_alpha_rgb24(int w,int h, unsigned char* src, + unsigned char *srca, int srcstride, unsigned char* dstbase, + int dststride); +extern void vo_draw_alpha_rgb32(int w,int h, unsigned char* src, + unsigned char *srca, int srcstride, unsigned char* dstbase, + int dststride); +extern void vo_draw_alpha_rgb15(int w,int h, unsigned char* src, + unsigned char *srca, int srcstride, unsigned char* dstbase, + int dststride); +extern void vo_draw_alpha_rgb16(int w,int h, unsigned char* src, + unsigned char *srca, int srcstride, unsigned char* dstbase, + int dststride); + static void draw_alpha(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride){ switch(bpp){ case 24: @@ -405,6 +418,9 @@ } } +extern void vo_draw_text(int dxs,int dys,void (*draw_alpha)(int x0,int y0, + int w,int h, unsigned char* src, unsigned char *srca, + int stride)); static void flip_page( void ){ vo_draw_text(image_width,image_height,draw_alpha);
--- a/libvo/vo_xmga.c Tue Apr 24 05:58:09 2001 +0000 +++ b/libvo/vo_xmga.c Tue Apr 24 10:21:12 2001 +0000 @@ -142,6 +142,10 @@ } +extern void vo_draw_text(int dxs,int dys,void (*draw_alpha)(int x0,int y0, + int w,int h, unsigned char* src, unsigned char *srca, + int stride)); + static void flip_page(void){ #ifdef SHOW_TIME unsigned int t;
--- a/libvo/vo_xv.c Tue Apr 24 05:58:09 2001 +0000 +++ b/libvo/vo_xv.c Tue Apr 24 10:21:12 2001 +0000 @@ -282,6 +282,10 @@ } +extern void vo_draw_text(int dxs,int dys,void (*draw_alpha)(int x0,int y0, + int w,int h, unsigned char* src, unsigned char *srca, + int stride)); + static void flip_page(void) { vo_draw_text(image_width,image_height,draw_alpha);