diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-10-02 05:17:23 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-10-02 05:17:23 +0300 |
| commit | ebb4abf2081026c63bb5c983f76447d9d2413656 (patch) | |
| tree | f2b3ed868645fd2546173be3500f4c3e0cdf3ecc /libvo/vo_gl2.c | |
| parent | 849dc0ba31f209dfdb48146512e48ee2203d0ee6 (diff) | |
| parent | 20571d6f6870dab84624cc6b6fbac82cde204f16 (diff) | |
| download | mpv-ebb4abf2081026c63bb5c983f76447d9d2413656.tar.bz2 mpv-ebb4abf2081026c63bb5c983f76447d9d2413656.tar.xz | |
Merge svn changes up to r27682
Addition of the "outdir" suboption to vo_png in svn was reverted
before merging.
Conflicts:
command.c
mplayer.c
Diffstat (limited to 'libvo/vo_gl2.c')
| -rw-r--r-- | libvo/vo_gl2.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libvo/vo_gl2.c b/libvo/vo_gl2.c index d7814948aa..070fd0d5d6 100644 --- a/libvo/vo_gl2.c +++ b/libvo/vo_gl2.c @@ -256,16 +256,16 @@ static int initTextures(void) ActiveTexture(GL_TEXTURE0); } - glCreateClearTex(GL_TEXTURE_2D, gl_internal_format, GL_LINEAR, + glCreateClearTex(GL_TEXTURE_2D, gl_internal_format, gl_bitmap_format, gl_bitmap_type, GL_LINEAR, texture_width, texture_height, 0); glTexEnvf (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); if (image_format == IMGFMT_YV12) { ActiveTexture(GL_TEXTURE1); - glCreateClearTex(GL_TEXTURE_2D, gl_internal_format, GL_LINEAR, + glCreateClearTex(GL_TEXTURE_2D, gl_internal_format, gl_bitmap_format, gl_bitmap_type, GL_LINEAR, texture_width / 2, texture_height / 2, 128); ActiveTexture(GL_TEXTURE2); - glCreateClearTex(GL_TEXTURE_2D, gl_internal_format, GL_LINEAR, + glCreateClearTex(GL_TEXTURE_2D, gl_internal_format, gl_bitmap_format, gl_bitmap_type, GL_LINEAR, texture_width / 2, texture_height / 2, 128); ActiveTexture(GL_TEXTURE0); } |