diff options
| author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-06-04 08:10:48 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-06-04 08:10:48 +0300 |
| commit | d5c868325cefcd5fad53361d1dfdc9757674eb70 (patch) | |
| tree | a838e509fdc2468220466e6337097b3ef590b00c /Copyright | |
| parent | 0cb5123c8f65b3d7715deb22ce8430eccc21996e (diff) | |
| parent | 5b3834c5d1033f05d798278c33782c5563247062 (diff) | |
| download | mpv-d5c868325cefcd5fad53361d1dfdc9757674eb70.tar.bz2 mpv-d5c868325cefcd5fad53361d1dfdc9757674eb70.tar.xz | |
Merge svn changes up to r26979
Most of the conflicts are trivial.
Conflicts:
Makefile
cfg-mplayer.h
input/input.c
libmenu/vf_menu.c
libmpcodecs/dec_video.c
libmpcodecs/vf_expand.c
libmpcodecs/vf_vo.c
libmpdemux/demux_mkv.c
libmpdemux/demuxer.c
libmpdemux/demuxer.h
libvo/vo_directfb2.c
libvo/vo_gl.c
libvo/vo_winvidix.c
libvo/vo_xv.c
libvo/vo_xvidix.c
libvo/vo_xvmc.c
libvo/x11_common.c
mplayer.c
osdep/timer-linux.c
stream/cache2.c
Diffstat (limited to 'Copyright')
| -rw-r--r-- | Copyright | 9 |
1 files changed, 9 insertions, 0 deletions
@@ -150,3 +150,12 @@ Directory: libmpdemux/yuv4mpeg* Copyright: 2001 Matthew J. Marjanovic <maddog@mir.com> 2001 Andrew Stevens <andrew.stevens@philips.com> License: GNU General Public License + +Name: NuppelVideo / RTJPEG +Version: 0.52a + patches +Homepage: http://web.archive.org/web/20050305195413/http://frost.htu.tuwien.ac.at/~roman/nuppelvideo/ +Directory: libmpcodecs/native/rtjpegn.[ch] libmpdemux/nuppelvideo.h +Copyright: 1998 Justin Schoeman (justin@suntiger.ee.up.ac.za) + 1998, 1999 Joerg Walter <trouble@moes.pmnet.uni-oldenburg.de> + 1999 Wim Taymans <wim.taymans@tvd.be> +License: GNU General Public License version 2 |