diff options
author | 2008-12-14 17:28:16 +0200 | |
---|---|---|
committer | 2008-12-14 17:28:16 +0200 | |
commit | a3ab9e8e4649601281f78949e56b92755ae1142a (patch) | |
tree | e31ee1ff4bafbfcf75c16259d9a64d18fea3bd51 /stream | |
parent | f01f7f6259badb2725be49af914d8db52e025cf6 (diff) | |
parent | bac1f05b4da4339b487e4e6ab972819142b3f13e (diff) |
Merge svn changes up to r28149
Diffstat (limited to 'stream')
-rw-r--r-- | stream/tvi_v4l2.c | 40 |
1 files changed, 25 insertions, 15 deletions
diff --git a/stream/tvi_v4l2.c b/stream/tvi_v4l2.c index 7a15a9b0be..0742135740 100644 --- a/stream/tvi_v4l2.c +++ b/stream/tvi_v4l2.c @@ -1,19 +1,29 @@ /* -** Video 4 Linux 2 input -** -** This file is part of MPlayer, see http://mplayerhq.hu/ for info. -** -** (c) 2003 Martin Olschewski <olschewski@zpr.uni-koeln.de> -** (c) 2003 Jindrich Makovicka <makovick@gmail.com> -** -** File licensed under the GPL, see http://www.fsf.org/ for more info. -** -** Some ideas are based on works from -** Alex Beregszaszi <alex@fsn.hu> -** Gerd Knorr <kraxel@bytesex.org> -** -** CODE IS UNDER DEVELOPMENT, NO FEATURE REQUESTS PLEASE! -*/ + * Video 4 Linux 2 input + * + * copyright (c) 2003 Martin Olschewski <olschewski@zpr.uni-koeln.de> + * copyright (c) 2003 Jindrich Makovicka <makovick@gmail.com> + * + * Some ideas are based on works from + * Alex Beregszaszi <alex@fsn.hu> + * Gerd Knorr <kraxel@bytesex.org> + * + * 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. + */ /* |