Merge svn changes up to r29412
commita2037a2effbd4622d0e8336245a9b14c3f886bde
authorUoti Urpala <uau@glyph.nonexistent.invalid>
Mon, 6 Jul 2009 23:56:01 +0000 (7 02:56 +0300)
committerUoti Urpala <uau@glyph.nonexistent.invalid>
Mon, 6 Jul 2009 23:56:01 +0000 (7 02:56 +0300)
treebd2face6dd36d2663197b23a33da9e9b2814f70c
parent0c2773a709276681575d2507aa60ee85c2d0b850
parent43079c51daa8c12b0a44e5ad8022c979dd9e8336
Merge svn changes up to r29412
32 files changed:
DOCS/man/fr/mplayer.1
Makefile
cfg-common-opts.h
command.c
configure
help/help_mp-hu.h
input/input.c
libao2/ao_pcm.c
libmpcodecs/ad_imaadpcm.c
libmpcodecs/vd_ffmpeg.c
libmpcodecs/vf_fspp.c
libmpdemux/asfheader.c
libmpdemux/aviheader.c
libmpdemux/demux_lavf.c
libmpdemux/demux_mov.c
libmpdemux/demux_ogg.c
libmpdemux/demux_real.c
libmpdemux/demux_rtp.cpp
libmpdemux/demux_viv.c
libmpdemux/demuxer.c
libmpdemux/mp_taglists.c
libvo/font_load_ft.c
libvo/vo_corevideo.m
libvo/vo_fbdev.c
mp_msg.c
mplayer.c
osdep/getch2-os2.c
osdep/getch2-win.c
osdep/getch2.c
stream/asf_mmst_streaming.c
stream/stream_file.c
stream/tcp.c