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/gl_common.h | |
| 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/gl_common.h')
| -rw-r--r-- | libvo/gl_common.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libvo/gl_common.h b/libvo/gl_common.h index 8b1e4b144c..1f1b73cca9 100644 --- a/libvo/gl_common.h +++ b/libvo/gl_common.h @@ -210,7 +210,7 @@ const char *glValName(GLint value); int glFindFormat(uint32_t format, int *bpp, GLint *gl_texfmt, GLenum *gl_format, GLenum *gl_type); int glFmt2bpp(GLenum format, GLenum type); -void glCreateClearTex(GLenum target, GLenum fmt, GLint filter, +void glCreateClearTex(GLenum target, GLenum fmt, GLenum format, GLenum type, GLint filter, int w, int h, unsigned char val); int glCreatePPMTex(GLenum target, GLenum fmt, GLint filter, FILE *f, int *width, int *height, int *maxval); |