Merge branch 'matroska'
commitc710c5ee504530eeb7ef7c73f6665fdb291dd206
authorUoti Urpala <uau@glyph.nonexistent.invalid>
Wed, 27 Jan 2010 22:56:26 +0000 (28 00:56 +0200)
committerUoti Urpala <uau@glyph.nonexistent.invalid>
Wed, 27 Jan 2010 22:56:26 +0000 (28 00:56 +0200)
tree7150c1cee52a18db270877ae384290274a129cd2
parentd84685ce13c7b31689b257e44b780373c91f8d32
parent55c50b3f9931095f7420ce6932329eceaf81d347
Merge branch 'matroska'
Makefile
libmpdemux/demuxer.c
libmpdemux/demuxer.h