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 /Copyright | |
| 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 'Copyright')
| -rw-r--r-- | Copyright | 8 |
1 files changed, 8 insertions, 0 deletions
@@ -142,3 +142,11 @@ Homepage: https://savannah.nongnu.org/projects/freesdp/ Directory: stream/freesdp/ Copyright: 2001-2003 Federico Montesino Pouzols <fedemp@suidzer0.org> License: GNU General Public License + +Name: MJPEG Tools +Version: post 2001-12-03 release or CVS snapshot +Homepage: http://mjpeg.sourceforge.net/ +Directory: libmpdemux/yuv4mpeg* +Copyright: 2001 Matthew J. Marjanovic <maddog@mir.com> + 2001 Andrew Stevens <andrew.stevens@philips.com> +License: GNU General Public License |