diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-09 19:18:43 +0200 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-09 19:18:43 +0200 |
commit | 12d3caebc7a44c67e7cc5a55e5ddadac844a225a (patch) | |
tree | e1d4d50d1960d8f7015dc7f139443550eccff51d /sub_cc.c | |
parent | 323890871d9a4d5bed8a38b1b676590ce614d87a (diff) | |
parent | b1ca7b2a66a2f53312cd831de42b80aa430c6898 (diff) | |
download | mpv-12d3caebc7a44c67e7cc5a55e5ddadac844a225a.tar.bz2 mpv-12d3caebc7a44c67e7cc5a55e5ddadac844a225a.tar.xz |
Merge svn changes up to r30475
Diffstat (limited to 'sub_cc.c')
-rw-r--r-- | sub_cc.c | 21 |
1 files changed, 18 insertions, 3 deletions
@@ -7,12 +7,27 @@ * Most notably, only the text information is decoded as of now, discarding * color, background and position info (see source below). * - * by Matteo Giani - * * uses source from the xine closed captions decoder + * + * Copyright (C) 2002 Matteo Giani + * + * 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> |