summaryrefslogtreecommitdiffstats
path: root/libmpdemux/demuxer.c
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-05-08 21:41:15 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-05-08 21:41:15 +0000
commitbc30e8e67323082a201e6c256bd88c5546e54a1d (patch)
tree731b04a0ebc7fe4e17a3d214d06062d5d6150449 /libmpdemux/demuxer.c
parentbf83d1a8ca3d9f87d4d8bb4fae27373054997b05 (diff)
downloadmpv-bc30e8e67323082a201e6c256bd88c5546e54a1d.tar.bz2
mpv-bc30e8e67323082a201e6c256bd88c5546e54a1d.tar.xz
Unconditionally compile the Matroska demuxer.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18405 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/demuxer.c')
-rw-r--r--libmpdemux/demuxer.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c
index 35553ce490..a95b453e87 100644
--- a/libmpdemux/demuxer.c
+++ b/libmpdemux/demuxer.c
@@ -81,9 +81,7 @@ demuxer_desc_t* demuxer_list[] = {
&demuxer_desc_nuv,
&demuxer_desc_real,
&demuxer_desc_smjpeg,
-#ifdef HAVE_MATROSKA
&demuxer_desc_matroska,
-#endif
&demuxer_desc_realaudio,
&demuxer_desc_vqf,
&demuxer_desc_mov,