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 /libmpdemux/yuv4mpeg_intern.h | |
| 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 'libmpdemux/yuv4mpeg_intern.h')
| -rw-r--r-- | libmpdemux/yuv4mpeg_intern.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libmpdemux/yuv4mpeg_intern.h b/libmpdemux/yuv4mpeg_intern.h index a956bbf4e9..f2d755345e 100644 --- a/libmpdemux/yuv4mpeg_intern.h +++ b/libmpdemux/yuv4mpeg_intern.h @@ -3,7 +3,7 @@ * * Copyright (C) 2001 Andrew Stevens <andrew.stevens@philips.com> * - * This file is part of the lavtools package (mjpeg.sourceforge.net). + * This file is part of the MJPEG Tools package (mjpeg.sourceforge.net). * * This program is free software; you can redistribute it and/or * modify it under the terms of version 2 of the GNU General Public License |