diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-07-07 02:06:48 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-07-07 02:07:11 +0300 |
| commit | 6d908205fbadbdf7ccdc6c5e0eb918f0b43f16e0 (patch) | |
| tree | 09a6acada909bd5d070ace54209cadeae66d15cf /libmpdemux/demuxer.c | |
| parent | e306174952d42e1cd6cc5efc50ae6bb0410501bc (diff) | |
| parent | eafe5b7517bbf408ae1ffc936a3abe2313c3b334 (diff) | |
| download | mpv-6d908205fbadbdf7ccdc6c5e0eb918f0b43f16e0.tar.bz2 mpv-6d908205fbadbdf7ccdc6c5e0eb918f0b43f16e0.tar.xz | |
Merge svn changes up to r29304
Diffstat (limited to 'libmpdemux/demuxer.c')
| -rw-r--r-- | libmpdemux/demuxer.c | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c index 46662cb926..3e01f25ebd 100644 --- a/libmpdemux/demuxer.c +++ b/libmpdemux/demuxer.c @@ -1,4 +1,22 @@ -//=================== DEMUXER v2.5 ========================= +/* + * DEMUXER v2.5 + * + * 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> |