diff options
| author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-05-07 13:07:48 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-05-07 13:15:37 +0300 |
| commit | 267a3f4c9c00848f32c341595d2d831157a79bee (patch) | |
| tree | cdef15bb746e3a41b1813076f24035fcc8385c30 /libvo | |
| parent | 5484215d044522bcd30516e458e421f403ca8e35 (diff) | |
| parent | 96fa9c4e249e9467f21e32191882e511e762fb1f (diff) | |
| download | mpv-267a3f4c9c00848f32c341595d2d831157a79bee.tar.bz2 mpv-267a3f4c9c00848f32c341595d2d831157a79bee.tar.xz | |
Merge svn changes up to r26680
Conflicts:
Makefile
configure
osdep/timer-darwin.c
Diffstat (limited to 'libvo')
| -rw-r--r-- | libvo/vo_gl.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/libvo/vo_gl.c b/libvo/vo_gl.c index 82e27c8b62..291a2a3b8a 100644 --- a/libvo/vo_gl.c +++ b/libvo/vo_gl.c @@ -669,16 +669,14 @@ static uint32_t get_image(mp_image_t *mpi) { return VO_FALSE; } if (mpi->flags & MP_IMGFLAG_READABLE) return VO_FALSE; - if (mpi->type == MP_IMGTYPE_IP || mpi->type == MP_IMGTYPE_IPB) - return VO_FALSE; // we can not provide readable buffers if (!gl_buffer) GenBuffers(1, &gl_buffer); BindBuffer(GL_PIXEL_UNPACK_BUFFER, gl_buffer); mpi->stride[0] = mpi->width * mpi->bpp / 8; - if (mpi->stride[0] * mpi->h > gl_buffersize) { - BufferData(GL_PIXEL_UNPACK_BUFFER, mpi->stride[0] * mpi->h, + if (mpi->stride[0] * mpi->height > gl_buffersize) { + BufferData(GL_PIXEL_UNPACK_BUFFER, mpi->stride[0] * mpi->height, NULL, GL_DYNAMIC_DRAW); - gl_buffersize = mpi->stride[0] * mpi->h; + gl_buffersize = mpi->stride[0] * mpi->height; } if (!gl_bufferptr) gl_bufferptr = MapBuffer(GL_PIXEL_UNPACK_BUFFER, GL_WRITE_ONLY); |