summaryrefslogtreecommitdiffstats
path: root/gst/matroska/matroska.c
diff options
context:
space:
mode:
authorTim-Philipp Müller <tim@centricular.net>2005-10-18 18:12:31 +0000
committerTim-Philipp Müller <tim@centricular.net>2005-10-18 18:12:31 +0000
commit66413b5f00cdac64f6b7de66e085e2523b5a36c0 (patch)
tree222fdecdaed3741145cc4fad1fcab30dd87a5841 /gst/matroska/matroska.c
parent2b6838d77c8fa4efbd24f8545449667c7aae65bd (diff)
gst/matroska/: Ported matroska demuxer to 0.9.
Original commit message from CVS: * gst/matroska/Makefile.am: * gst/matroska/ebml-read.c: * gst/matroska/ebml-read.h: * gst/matroska/matroska-demux.c: * gst/matroska/matroska-demux.h: * gst/matroska/matroska.c: (plugin_init): Ported matroska demuxer to 0.9.
Diffstat (limited to 'gst/matroska/matroska.c')
-rw-r--r--gst/matroska/matroska.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/gst/matroska/matroska.c b/gst/matroska/matroska.c
index aceb3402..b274b945 100644
--- a/gst/matroska/matroska.c
+++ b/gst/matroska/matroska.c
@@ -23,13 +23,13 @@
#include "config.h"
#endif
-/* #include "matroska-demux.h" */
+#include "matroska-demux.h"
#include "matroska-mux.h"
static gboolean
plugin_init (GstPlugin * plugin)
{
- return /* gst_matroska_demux_plugin_init (plugin) && */
+ return gst_matroska_demux_plugin_init (plugin) &&
gst_matroska_mux_plugin_init (plugin);
}