Merge svn changes up to r28310
commit9bcd12fdf5c6f85e9bb391caa2713021624a957e
authorUoti Urpala <uau@glyph.nonexistent.invalid>
Thu, 15 Jan 2009 03:07:09 +0000 (15 05:07 +0200)
committerUoti Urpala <uau@glyph.nonexistent.invalid>
Thu, 15 Jan 2009 03:57:31 +0000 (15 05:57 +0200)
tree375eac533ead90a45e7121e5ab307861b4ef52c8
parentd419ecd161634e79dab3ac57d57c4bccba2adcdc
parente0d66b140e1da7a793bff15003cadab79544b1dd
Merge svn changes up to r28310

The libdvdread4 and libdvdnav directories, which are externals in the
svn repository, are at least for now not included in any form. I added
configure checks to automatically disable internal libdvdread and
libdvdnav if the corresponding directories are not present; if they're
added manually then things work the same as in svn.
39 files changed:
DOCS/man/en/mplayer.1
DOCS/man/fr/mplayer.1
DOCS/tech/libmpcodecs.txt
Makefile
cfg-common-opts.h
cfg-common.h
configure
libaf/af.h
libmpcodecs/ad_qtaudio.c
libmpcodecs/vd_ffmpeg.c
libmpcodecs/vd_qtvideo.c
libmpcodecs/ve_xvid4.c
libmpcodecs/vf_remove_logo.c
libmpdemux/demux_avi.c
libvo/font_load.h
libvo/font_load_ft.c
libvo/gl_common.c
libvo/mga_common.c
libvo/old_vo_wrapper.c
libvo/old_vo_wrapper.h
libvo/sub.c
libvo/sub.h
libvo/vo_gif89a.c
libvo/vo_gl.c
libvo/vo_macosx.m
libvo/vo_s3fb.c
libvo/vo_xv.c
libvo/vo_xvmc.c
libvo/vo_xvr100.c
libvo/w32_common.c
libvo/x11_common.c
libvo/x11_common.h
mencoder.c
mplayer.c
osdep/getch2-win.c
osdep/timer-win2.c
playtreeparser.c
spudec.c
stream/stream_dvd.c