diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-09-10 23:59:08 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-09-10 23:59:08 +0300 |
| commit | 259ea9d7034566760785fd5253f97b65ee8cd6ed (patch) | |
| tree | 421140d6bf14e32f09acc4d0180d2273a9e88965 /libmpcodecs/vd_zrmjpeg.c | |
| parent | b56858342fdbe48489618107df75e5bd0451eb0b (diff) | |
| parent | 60a3099c0db23d03b9f2501c2ef2cf35847b30a7 (diff) | |
| download | mpv-259ea9d7034566760785fd5253f97b65ee8cd6ed.tar.bz2 mpv-259ea9d7034566760785fd5253f97b65ee8cd6ed.tar.xz | |
Merge svn changes up to r27573
Conflicts:
libmpcodecs/vd_ffmpeg.c
Diffstat (limited to 'libmpcodecs/vd_zrmjpeg.c')
| -rw-r--r-- | libmpcodecs/vd_zrmjpeg.c | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/libmpcodecs/vd_zrmjpeg.c b/libmpcodecs/vd_zrmjpeg.c index 6f8ce58fcf..a2d1d21e8b 100644 --- a/libmpcodecs/vd_zrmjpeg.c +++ b/libmpcodecs/vd_zrmjpeg.c @@ -1,9 +1,26 @@ /* - * Copyright (C) 2005 Rik Snel <rsnel@cube.dyndns.org>, license GPL v2 or later - * - based on vd_mpegpes.c by A'rpi (C) 2002-2003 + * Copyright (C) 2005 Rik Snel <rsnel@cube.dyndns.org> + * - based on vd_mpegpes.c by A'rpi (C) 2002-2003 * - guess_mjpeg_type code stolen from lav_io.c (C) 2000 Rainer Johanni * <Rainer@Johanni.de> from the mjpegtools package + * + * 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> |