Merge svn changes up to r30798
commitbc1d0ca37d9bdfd69a945043650e0246ffeb5f94
authorUoti Urpala <uau@glyph.nonexistent.invalid>
Wed, 10 Mar 2010 00:14:30 +0000 (10 02:14 +0200)
committerUoti Urpala <uau@glyph.nonexistent.invalid>
Wed, 10 Mar 2010 00:35:02 +0000 (10 02:35 +0200)
tree8269c9cbc1df72afb5715b77669698a0781f6250
parentf7cc4152f7c55808c5dd6bbd49c216c9345eb686
parente9a5e7f667d1b0c0dec0053ad9ec6f7bc3162b60
Merge svn changes up to r30798
22 files changed:
asxparser.c
input/input.c
input/lirc.c
libmpcodecs/ve_x264.c
libmpcodecs/vf_remove_logo.c
libmpdemux/demuxer.h
libmpdemux/mp3_hdr.c
libvo/video_out.c
libvo/vo_gl.c
libvo/vo_gl2.c
libvo/x11_common.c
mencoder.c
osdep/getch2-win.c
playtree.c
playtreeparser.c
stream/cache2.c
stream/network.c
stream/stream.c
stream/stream.h
stream/stream_cddb.c
stream/stream_vcd.c
subreader.c