diff options
| author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-05-15 21:19:35 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-05-15 21:19:35 +0300 |
| commit | a41db36b22053c2cf103899f3510f68ff5645662 (patch) | |
| tree | e2e3d734a828caf8e1fbf1373d818f06c979e53d /libvo/jpeg_enc.c | |
| parent | 267a3f4c9c00848f32c341595d2d831157a79bee (diff) | |
| parent | 84fa3d69f360c87fce4efe6acb128ad78d3647e2 (diff) | |
| download | mpv-a41db36b22053c2cf103899f3510f68ff5645662.tar.bz2 mpv-a41db36b22053c2cf103899f3510f68ff5645662.tar.xz | |
Merge svn changes up to r26783
Conflicts:
Makefile
common.mak
configure
libmpcodecs/vd_ffmpeg.c
libmpdemux/demux_mkv.c
libvo/vo_xv.c
mplayer.c
Diffstat (limited to 'libvo/jpeg_enc.c')
| -rw-r--r-- | libvo/jpeg_enc.c | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/libvo/jpeg_enc.c b/libvo/jpeg_enc.c index eacd68e5bb..f4edc4b265 100644 --- a/libvo/jpeg_enc.c +++ b/libvo/jpeg_enc.c @@ -1,25 +1,28 @@ -/* Straightforward (to be) optimized JPEG encoder for the YUV422 format - * based on mjpeg code from ffmpeg. +/* + * straightforward (to be) optimized JPEG encoder for the YUV422 format + * based on MJPEG code from FFmpeg + * + * For an excellent introduction to the JPEG format, see: + * http://www.ece.purdue.edu/~bouman/grad-labs/lab8/pdf/lab.pdf * * Copyright (c) 2002, Rik Snel - * Parts from ffmpeg Copyright (c) 2000-2002 Fabrice Bellard + * parts from FFmpeg Copyright (c) 2000-2002 Fabrice Bellard + * + * This file is part of MPlayer. * - * This program is free software; you can redistribute it and/or modify + * 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. * - * This program is distributed in the hope that it will be useful, + * 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 this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - * For an excellent introduction to the JPEG format, see: - * http://www.ece.purdue.edu/~bouman/grad-labs/lab8/pdf/lab.pdf + * 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. */ |