| commit | d5c868325cefcd5fad53361d1dfdc9757674eb70 | |
| author | Uoti Urpala <uau@symbol.nonexistent.invalid> | |
| Wed, 4 Jun 2008 05:10:48 +0000 (4 08:10 +0300) | ||
| committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | |
| Wed, 4 Jun 2008 05:10:48 +0000 (4 08:10 +0300) | ||
| tree | a838e509fdc2468220466e6337097b3ef590b00c | treesnapshot (tar.gz zip) |
| parent | 0cb5123c8f65b3d7715deb22ce8430eccc21996e | commitdiff |
| parent | 5b3834c5d1033f05d798278c33782c5563247062 | commitdiff |
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
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
63 files changed: