Merge svn changes up to r29304
commit6d908205fbadbdf7ccdc6c5e0eb918f0b43f16e0
authorUoti Urpala <uau@glyph.nonexistent.invalid>
Mon, 6 Jul 2009 23:06:48 +0000 (7 02:06 +0300)
committerUoti Urpala <uau@glyph.nonexistent.invalid>
Mon, 6 Jul 2009 23:07:11 +0000 (7 02:07 +0300)
tree09a6acada909bd5d070ace54209cadeae66d15cf
parente306174952d42e1cd6cc5efc50ae6bb0410501bc
parenteafe5b7517bbf408ae1ffc936a3abe2313c3b334
Merge svn changes up to r29304
32 files changed:
DOCS/man/fr/mplayer.1
Makefile
configure
libmpcodecs/vf_zrmjpeg.c
libmpdemux/asfheader.c
libmpdemux/aviheader.c
libmpdemux/demux_asf.c
libmpdemux/demux_audio.c
libmpdemux/demux_avi.c
libmpdemux/demux_demuxers.c
libmpdemux/demux_lmlm4.c
libmpdemux/demux_mkv.c
libmpdemux/demux_mov.c
libmpdemux/demux_mpg.c
libmpdemux/demux_nut.c
libmpdemux/demux_ogg.c
libmpdemux/demux_pva.c
libmpdemux/demux_real.c
libmpdemux/demux_rtp.cpp
libmpdemux/demux_viv.c
libmpdemux/demuxer.c
libmpdemux/demuxer.h
libmpdemux/ebml.h
libmpdemux/mp3_hdr.c
libmpdemux/muxer.c
libmpdemux/muxer_avi.c
libmpdemux/muxer_lavf.c
libmpdemux/muxer_mpeg.c
libmpdemux/muxer_rawaudio.c
libmpdemux/stheader.h
libmpdemux/video.c
subreader.c