diff options
| author | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-09-22 02:33:28 +0000 |
|---|---|---|
| committer | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-09-22 02:33:28 +0000 |
| commit | d483a015a2bbca2aec8a287c0ff6eeb0f176a8bb (patch) | |
| tree | 8f1d76f283da6022022a35e300c30faf93e71e83 /libvo/mga_common.c | |
| parent | 61c5a99851ea41449a513619dd68791c93e30ef3 (diff) | |
| download | mpv-d483a015a2bbca2aec8a287c0ff6eeb0f176a8bb.tar.bz2 mpv-d483a015a2bbca2aec8a287c0ff6eeb0f176a8bb.tar.xz | |
tons of warning fixes, also some 10l bugfixes, including Dominik's PVA bug
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7473 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo/mga_common.c')
| -rw-r--r-- | libvo/mga_common.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/libvo/mga_common.c b/libvo/mga_common.c index ac46916021..67f129f5f3 100644 --- a/libvo/mga_common.c +++ b/libvo/mga_common.c @@ -15,7 +15,6 @@ static uint8_t *vid_data, *frames[4]; static int f = -1; static void draw_alpha(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride){ - int x,y; uint32_t bespitch = (mga_vid_config.src_width + 31) & ~31; switch(mga_vid_config.format){ case MGA_VID_FORMAT_YV12: @@ -38,12 +37,8 @@ static void draw_alpha(int x0,int y0, int w,int h, unsigned char* src, unsigned static void draw_slice_g200(uint8_t *image[], int stride[], int width,int height,int x,int y) { - uint8_t *src; - uint8_t *src2; uint8_t *dest; - uint32_t bespitch,h,w; - - bespitch = (mga_vid_config.src_width + 31) & ~31; + uint32_t bespitch = (mga_vid_config.src_width + 31) & ~31; dest = vid_data + bespitch*y + x; mem2agpcpy_pic(dest, image[0], width, height, bespitch, stride[0]); @@ -60,11 +55,9 @@ draw_slice_g200(uint8_t *image[], int stride[], int width,int height,int x,int y static void draw_slice_g400(uint8_t *image[], int stride[], int w,int h,int x,int y) { - uint8_t *src; uint8_t *dest; uint8_t *dest2; uint32_t bespitch,bespitch2; - int i; bespitch = (mga_vid_config.src_width + 31) & ~31; bespitch2 = bespitch/2; @@ -327,7 +320,6 @@ static uint32_t control(uint32_t request, void *data, ...) static int mga_init(){ - char *frame_mem; mga_vid_config.num_frames=(vo_directrendering && !vo_doublebuffering)?1:3; mga_vid_config.version=MGA_VID_VERSION; @@ -360,6 +352,7 @@ static int mga_uninit(){ munmap(frames[0],mga_vid_config.frame_size*mga_vid_config.num_frames); close(f); f = -1; + return 0; } static uint32_t preinit(const char *arg) |