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 /libvo/vo_pnm.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 'libvo/vo_pnm.c')
| -rw-r--r-- | libvo/vo_pnm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libvo/vo_pnm.c b/libvo/vo_pnm.c index fe5909329a..a6e4431331 100644 --- a/libvo/vo_pnm.c +++ b/libvo/vo_pnm.c @@ -1,7 +1,7 @@ /* * PPM/PGM/PGMYUV video output driver * - * Written by Ivo van Poorten. (C) Copyright 2004, 2005. + * copyright (C) 2004, 2005 Ivo van Poorten * * This file is part of MPlayer. * |