RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

some warnings killed 

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@613 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
szabii 2001-04-24 10:21:12 +00:00
parent 8c0b63a38a
commit cd30d641c1
11 changed files with 79 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libvo/vo_dga.c
View File

@ -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 @@ void vd_printf( int level, const char *str, ...){
//---------------------------------------------------------
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 @@ static void check_events(void)
//---------------------------------------------------------
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 ){

4
libvo/vo_fsdga.c
View File

@ -281,7 +281,7 @@ static uint32_t query_format( uint32_t format )
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 @@ static uint32_t init( uint32_t width, uint32_t height,
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);

2
libvo/vo_gl.c
View File

@ -79,7 +79,7 @@ static uint32_t image_bytes;
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 );

3
libvo/vo_mga.c
View File

@ -111,6 +111,9 @@ uninit(void)
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)
{

2
libvo/vo_odivx.c
View File

@ -152,7 +152,7 @@ enc_frame.bitstream=buffer;
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;

3
libvo/vo_png.c
View File

@ -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 @@ struct pngdata create_png (char * fname)
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;
}

6
libvo/vo_sdl.c
View File

@ -445,7 +445,7 @@ init(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint3
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 @@ static void check_events (void)
* 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;

22
libvo/vo_svga.c
View File

@ -418,6 +418,20 @@ static const vo_info_t* get_info(void) {
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 @@ static uint32_t draw_frame(uint8_t *src[]) {
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 @@ static uint32_t draw_slice(uint8_t *image[], int stride[],
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 @@ static void uninit(void) {
free(modelist);
}
}

18
libvo/vo_x11.c
View File

@ -319,7 +319,7 @@ static uint32_t init( uint32_t width,uint32_t height,uint32_t d_width,uint32_t d
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 @@ static void Display_Image( XImage *myximage,uint8_t *ImageData )
#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 @@ static void draw_alpha(int x0,int y0, int w,int h, unsigned char* src, unsigned
}
}
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);

4
libvo/vo_xmga.c
View File

@ -142,6 +142,10 @@ static void check_events(void)
}
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;

4
libvo/vo_xv.c
View File

@ -282,6 +282,10 @@ static void draw_alpha(int x0,int y0, int w,int h, unsigned char* src, unsigned
}
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);