diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-09-20 16:13:33 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-09-20 16:13:33 +0300 |
| commit | 849dc0ba31f209dfdb48146512e48ee2203d0ee6 (patch) | |
| tree | 27b3fcc37410ea5f646eb5fc2411406f2cdee175 /libvo/vo_directfb2.c | |
| parent | 259ea9d7034566760785fd5253f97b65ee8cd6ed (diff) | |
| parent | 7756839a147ce2421cfb4e3de046364962094b60 (diff) | |
| download | mpv-849dc0ba31f209dfdb48146512e48ee2203d0ee6.tar.bz2 mpv-849dc0ba31f209dfdb48146512e48ee2203d0ee6.tar.xz | |
Merge svn changes up to r27649
Conflicts:
Makefile
configure
libvo/x11_common.c
Diffstat (limited to 'libvo/vo_directfb2.c')
| -rw-r--r-- | libvo/vo_directfb2.c | 43 |
1 files changed, 22 insertions, 21 deletions
diff --git a/libvo/vo_directfb2.c b/libvo/vo_directfb2.c index b8acb74080..9124ad5dd0 100644 --- a/libvo/vo_directfb2.c +++ b/libvo/vo_directfb2.c @@ -1,25 +1,26 @@ /* - MPlayer video driver for DirectFramebuffer device - - (C) 2002 - - Written by Jiri Svoboda <Jiri.Svoboda@seznam.cz> - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301 USA. -*/ + * MPlayer video driver for DirectFramebuffer device + * + * copyright (C) 2002 Jiri Svoboda <Jiri.Svoboda@seznam.cz> + * + * based on vo_directfb2.c + * + * This file is part of MPlayer. + * + * MPlayer is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser 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. + */ // directfb includes |