Merge svn changes up to r31004
commite913d6c5dabcf342d8c1a7070382d712fc354948
authorUoti Urpala <uau@glyph.nonexistent.invalid>
Mon, 26 Apr 2010 14:54:52 +0000 (26 17:54 +0300)
committerUoti Urpala <uau@glyph.nonexistent.invalid>
Mon, 26 Apr 2010 14:55:05 +0000 (26 17:55 +0300)
tree965b5b698c7075e53123593eb4b5bfdb45d78c56
parentbe935e27666d8fdbf387adb1fcc30d243f6359dc
parent00959d5cf76d4ad94de9d0022b7b40a58acf2b95
Merge svn changes up to r31004
29 files changed:
cfg-mencoder.h
cfg-mplayer.h
configure
etc/codecs.conf
libmenu/menu_chapsel.c
libmenu/menu_cmdlist.c
libmenu/menu_console.c
libmenu/menu_dvbin.c
libmenu/menu_filesel.c
libmenu/menu_param.c
libmenu/menu_pt.c
libmenu/menu_txt.c
libmpcodecs/ae_lame.c
libmpcodecs/ve_lavc.c
libmpcodecs/ve_nuv.c
libmpcodecs/ve_vfw.c
libmpcodecs/ve_x264.c
libmpcodecs/ve_xvid4.c
libmpdemux/demux_avi.c
libmpdemux/muxer_lavf.c
libmpdemux/muxer_mpeg.c
libvo/gl_common.c
libvo/gl_common.h
libvo/vo_dxr2.c
libvo/vo_gl.c
libvo/vo_gl2.c
libvo/vo_xvmc.c
stream/http.c
stream/stream.c