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_x11.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_x11.c')
| -rw-r--r-- | libvo/vo_x11.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/libvo/vo_x11.c b/libvo/vo_x11.c index 4e6b1b79fb..91d4d96269 100644 --- a/libvo/vo_x11.c +++ b/libvo/vo_x11.c @@ -523,8 +523,8 @@ static void flip_page(void) static int draw_slice(uint8_t * src[], int stride[], int w, int h, int x, int y) { - uint8_t *dst[3]; - int dstStride[3]; + uint8_t *dst[MP_MAX_PLANES] = {NULL}; + int dstStride[MP_MAX_PLANES] = {0}; if ((old_vo_dwidth != vo_dwidth || old_vo_dheight != vo_dheight) /*&& y==0 */ && zoomFlag) @@ -557,8 +557,6 @@ static int draw_slice(uint8_t * src[], int stride[], int w, int h, } dst_width = newW; } - dstStride[1] = dstStride[2] = 0; - dst[1] = dst[2] = NULL; dstStride[0] = image_width * ((bpp + 7) / 8); dst[0] = ImageData; |