diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-09 19:34:30 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-09 19:34:30 +0200 |
| commit | 5c6795a687cd9149e57985b632cf7a1c4a5c8310 (patch) | |
| tree | 60f61ddbcd8aa96f04b9851029923d81d0b0be89 /loader | |
| parent | 8a93561c8187058ae6278c9c6adb5ada7bedeff4 (diff) | |
| parent | d7a1d12f6147b53944a56117feae66d8e0e52fb1 (diff) | |
| download | mpv-5c6795a687cd9149e57985b632cf7a1c4a5c8310.tar.bz2 mpv-5c6795a687cd9149e57985b632cf7a1c4a5c8310.tar.xz | |
Merge svn changes up to r30494
Conflicts:
libvo/vo_gl.c
libvo/x11_common.c
Diffstat (limited to 'loader')
| -rw-r--r-- | loader/qtx/list.c | 21 | ||||
| -rw-r--r-- | loader/qtx/qtxload.c | 18 |
2 files changed, 37 insertions, 2 deletions
diff --git a/loader/qtx/list.c b/loader/qtx/list.c index 8c1ea6abe2..c4a72c1480 100644 --- a/loader/qtx/list.c +++ b/loader/qtx/list.c @@ -1,5 +1,22 @@ -/* to compile: - edit ../win32.c, change the #if 0 to 1 at line 1326 to enabel quicktime fix! +/* + * To compile edit loader/win32.c and change the #if 0 to 1 at line 1326 + * to enable quicktime fix! + * + * 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. */ #include <stdio.h> diff --git a/loader/qtx/qtxload.c b/loader/qtx/qtxload.c index 029fad2881..838399ba14 100644 --- a/loader/qtx/qtxload.c +++ b/loader/qtx/qtxload.c @@ -1,3 +1,21 @@ +/* + * 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. + */ + #include <stdio.h> #include <stdlib.h> #include <string.h> |