Merge svn changes up to r30672
commit327463be525b12e3d00d5fa0e8e15d5000fcd27b
authorUoti Urpala <uau@glyph.nonexistent.invalid>
Tue, 9 Mar 2010 22:34:16 +0000 (10 00:34 +0200)
committerUoti Urpala <uau@glyph.nonexistent.invalid>
Tue, 9 Mar 2010 22:34:16 +0000 (10 00:34 +0200)
tree37db96b1a1b4b1b941706e4e4c4dcdec9cbd4ed2
parent7e90be7093daa79fc26dedac6cfb90e87c8acaff
parent88a8591bc6ae6b9fdbf293ac75967cb9e21f4875
Merge svn changes up to r30672
libmpdemux/demuxer.c
stream/network.c
stream/stream.c
stream/stream.h
stream/stream_cddb.c