Merge svn changes up to r29962
commit5995bc175aea0417ce7ff7285c1c8fc84ebb5704
authorUoti Urpala <uau@glyph.nonexistent.invalid>
Sun, 22 Nov 2009 23:56:21 +0000 (23 01:56 +0200)
committerUoti Urpala <uau@glyph.nonexistent.invalid>
Sun, 22 Nov 2009 23:56:21 +0000 (23 01:56 +0200)
tree7fa0b90e03fc5b3a6447b79754b654bc279f5237
parent4c552b2e420ba4cb6d888b12360c7bf63e7cd03a
parentaf2988cbcef1b057772d44b9f9752be3f15960b0
Merge svn changes up to r29962
34 files changed:
Makefile
help/help_mp-hu.h
libmpcodecs/ad_ffmpeg.c
libmpcodecs/vd_ffmpeg.c
libmpcodecs/vf_crop.c
libmpcodecs/vf_delogo.c
libmpcodecs/vf_eq.c
libmpcodecs/vf_expand.c
libmpcodecs/vf_format.c
libmpcodecs/vf_hue.c
libmpcodecs/vf_noformat.c
libmpcodecs/vf_scale.c
libmpdemux/demux_audio.c
libmpdemux/demux_avi.c
libmpdemux/demux_lavf.c
libmpdemux/demux_ty.c
libmpdemux/muxer_lavf.c
libmpdemux/video.c
libvo/gl_common.c
libvo/vo_gl.c
libvo/vo_gl2.c
libvo/w32_common.c
m_option.c
mplayer.c
stream/cache2.c
stream/stream.c
stream/stream.h
stream/stream_cue.c
stream/stream_dvd.c
stream/stream_dvdnav.c
stream/stream_file.c
stream/stream_live555.c
stream/stream_netstream.c
stream/stream_smb.c