diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-04-01 02:26:34 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-04-01 02:43:47 +0300 |
| commit | cf9edda1d370d39bc8a3d020a9c2bc4090d2457e (patch) | |
| tree | 1d1bbc529a4e8109fb6aa5cadf0dbbb7bd61013a /libvo/vo_vesa.c | |
| parent | 7af8417ae7beb409f54849956a7037bc66c4c334 (diff) | |
| parent | 1c37a6427abef0827c608d328d37ca1b1a0a022d (diff) | |
| download | mpv-cf9edda1d370d39bc8a3d020a9c2bc4090d2457e.tar.bz2 mpv-cf9edda1d370d39bc8a3d020a9c2bc4090d2457e.tar.xz | |
Merge svn changes up to r29117
Diffstat (limited to 'libvo/vo_vesa.c')
| -rw-r--r-- | libvo/vo_vesa.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libvo/vo_vesa.c b/libvo/vo_vesa.c index 8b9e05a731..63342435f3 100644 --- a/libvo/vo_vesa.c +++ b/libvo/vo_vesa.c @@ -283,8 +283,8 @@ static void vbeCopyData(uint8_t *image) static int draw_slice(uint8_t *image[], int stride[], int w,int h,int x,int y) { int dstride=HAS_DGA()?video_mode_info.XResolution:dstW; - uint8_t *dst[3]= {dga_buffer, NULL, NULL}; - int dstStride[3]; + uint8_t *dst[MP_MAX_PLANES]={dga_buffer}; + int dstStride[MP_MAX_PLANES]={0}; if( mp_msg_test(MSGT_VO,MSGL_DBG3) ) mp_msg(MSGT_VO,MSGL_DBG3, "vo_vesa: draw_slice was called: w=%u h=%u x=%u y=%u\n",w,h,x,y); dstStride[0]=dstride*((dstBpp+7)/8); @@ -423,8 +423,8 @@ static int draw_frame(uint8_t *src[]) { int dstride=HAS_DGA()?video_mode_info.XResolution:dstW; int srcStride[1]; - uint8_t *dst[3]= {dga_buffer, NULL, NULL}; - int dstStride[3]; + uint8_t *dst[MP_MAX_PLANES]={dga_buffer}; + int dstStride[MP_MAX_PLANES]={0}; dstStride[0]=dstride*((dstBpp+7)/8); dstStride[1]= dstStride[2]=dstStride[0]>>1; |