diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-02-12 04:17:55 +0200 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-02-12 04:17:55 +0200 |
commit | 1e869638280f962fb80f372d152234f21246c2af (patch) | |
tree | 64657f88e7902aa000f44f40be4f8e575f58c8de /libvo/vo_yuv4mpeg.c | |
parent | 9790f4e6e72cdc8093be966d3d6e007c8f44a035 (diff) | |
parent | 379b176f25905f273a368336c3f5f287eeea51a2 (diff) | |
download | mpv-1e869638280f962fb80f372d152234f21246c2af.tar.bz2 mpv-1e869638280f962fb80f372d152234f21246c2af.tar.xz |
Merge svn changes up to r28537
Diffstat (limited to 'libvo/vo_yuv4mpeg.c')
-rw-r--r-- | libvo/vo_yuv4mpeg.c | 25 |
1 files changed, 20 insertions, 5 deletions
diff --git a/libvo/vo_yuv4mpeg.c b/libvo/vo_yuv4mpeg.c index 759f0537ec..420e7fea91 100644 --- a/libvo/vo_yuv4mpeg.c +++ b/libvo/vo_yuv4mpeg.c @@ -1,8 +1,7 @@ -/* - * vo_yuv4mpeg.c, yuv4mpeg (mjpegtools) interface +/* + * yuv4mpeg (mjpegtools) interface * - * Thrown together by - * Robert Kesterson <robertk@robertk.com> + * Thrown together by Robert Kesterson <robertk@robertk.com> * Based on the pgm output plugin, the rgb2rgb postproc filter, divxdec, * and probably others. * @@ -17,8 +16,24 @@ * * 2002/04/17 Juergen Hammelmann <juergen.hammelmann@gmx.de> * - added support for output of subtitles - * best, if you give option '-osdlevel 0' to mplayer for + * best, if you give option '-osdlevel 0' to mplayer for * no watching the seek+timer + * + * 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> |