diff options
| author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-12-05 20:56:49 +0000 |
|---|---|---|
| committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-12-05 20:56:49 +0000 |
| commit | 7fd346bc71d8bf204c5fddd2ad532e7adb4794b9 (patch) | |
| tree | da5160710ade281bd9ef212d0a9d5d0bdf989ea2 /libvo | |
| parent | e7d53f6d86eee73e0f48ad1032dfd67acd884a73 (diff) | |
| download | mpv-7fd346bc71d8bf204c5fddd2ad532e7adb4794b9.tar.bz2 mpv-7fd346bc71d8bf204c5fddd2ad532e7adb4794b9.tar.xz | |
Avoid one more duplicated logic.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28099 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo')
| -rw-r--r-- | libvo/vo_gl.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libvo/vo_gl.c b/libvo/vo_gl.c index 0bcd5c363a..74142d5039 100644 --- a/libvo/vo_gl.c +++ b/libvo/vo_gl.c @@ -681,6 +681,7 @@ static int draw_slice(uint8_t *src[], int stride[], int w,int h,int x,int y) } static uint32_t get_image(mp_image_t *mpi) { + int needed_size; if (!GenBuffers || !BindBuffer || !BufferData || !MapBuffer) { if (!err_shown) mp_msg(MSGT_VO, MSGL_ERR, "[gl] extensions missing for dr\n" @@ -697,8 +698,9 @@ static uint32_t get_image(mp_image_t *mpi) { GenBuffers(1, &gl_buffer); BindBuffer(GL_PIXEL_UNPACK_BUFFER, gl_buffer); mpi->stride[0] = mpi->width * mpi->bpp / 8; - if (mpi->stride[0] * mpi->height > gl_buffersize) { - gl_buffersize = mpi->stride[0] * mpi->height; + needed_size = mpi->stride[0] * mpi->height; + if (needed_size > gl_buffersize) { + gl_buffersize = needed_size; BufferData(GL_PIXEL_UNPACK_BUFFER, gl_buffersize, NULL, GL_DYNAMIC_DRAW); } |