diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-09-10 23:59:08 +0300 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-09-10 23:59:08 +0300 |
commit | 259ea9d7034566760785fd5253f97b65ee8cd6ed (patch) | |
tree | 421140d6bf14e32f09acc4d0180d2273a9e88965 /libvo/gl_common.c | |
parent | b56858342fdbe48489618107df75e5bd0451eb0b (diff) | |
parent | 60a3099c0db23d03b9f2501c2ef2cf35847b30a7 (diff) | |
download | mpv-259ea9d7034566760785fd5253f97b65ee8cd6ed.tar.bz2 mpv-259ea9d7034566760785fd5253f97b65ee8cd6ed.tar.xz |
Merge svn changes up to r27573
Conflicts:
libmpcodecs/vd_ffmpeg.c
Diffstat (limited to 'libvo/gl_common.c')
-rw-r--r-- | libvo/gl_common.c | 31 |
1 files changed, 25 insertions, 6 deletions
diff --git a/libvo/gl_common.c b/libvo/gl_common.c index 9c84e71cf2..2dad92c605 100644 --- a/libvo/gl_common.c +++ b/libvo/gl_common.c @@ -1,13 +1,32 @@ -/** - * \file gl_common.c - * \brief OpenGL helper functions used by vo_gl.c and vo_gl2.c +/* + * common OpenGL routines * - * Common OpenGL routines. - * Copyleft (C) Reimar Döffinger <Reimar.Doeffinger@stud.uni-karlsruhe.de>, 2005 - * Licensed under the GNU GPL v2 or later. + * copyleft (C) 2005 Reimar Döffinger <Reimar.Doeffinger@stud.uni-karlsruhe.de> * Special thanks go to the xine team and Matthias Hopf, whose video_out_opengl.c * gave me lots of good ideas. + * + * This file is part of MPlayer. + * + * MPlayer is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * MPlayer is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ + +/** + * \file gl_common.c + * \brief OpenGL helper functions used by vo_gl.c and vo_gl2.c + */ + #include <stdlib.h> #include <stdio.h> #include <string.h> |