From 5bb80c9f5359a446d52ad7824095ae4c67bf3cdf Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Tue, 28 Oct 2003 20:52:41 +0000 Subject: merge TYPEFIND branch. Major changes: Original commit message from CVS: merge TYPEFIND branch. Major changes: - totally reworked type(find) system - all typefind functions are in gst/typefind now - more typefind functions then before - some plugins might fail to compile now because I don't have them installed and they a) require bytestream or b) haven't had their typefind fixed. Please fix those plugins and put the typefind functions into gst/typefind if they don't have dependencies --- ext/mplex/gstmplex.cc | 4 ++-- ext/mplex/gstmplex.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'ext/mplex') diff --git a/ext/mplex/gstmplex.cc b/ext/mplex/gstmplex.cc index 523cc74f..8f8a94a3 100644 --- a/ext/mplex/gstmplex.cc +++ b/ext/mplex/gstmplex.cc @@ -578,8 +578,8 @@ plugin_init (GModule *module, GstPlugin *plugin) GstElementFactory *factory; /* this filter needs the bytestream package */ -/* if (!gst_library_load ("gstbytestream")) - return FALSE;*/ + if (!gst_library_load ("gstbytestream")) + return FALSE; /* create an elementfactory for the avi_demux element */ factory = gst_element_factory_new ("mplex",GST_TYPE_MPLEX, diff --git a/ext/mplex/gstmplex.h b/ext/mplex/gstmplex.h index 8b108ed1..2af37379 100644 --- a/ext/mplex/gstmplex.h +++ b/ext/mplex/gstmplex.h @@ -26,7 +26,7 @@ #include #include -#include +#include #include "outputstream.hh" #include "bits.hh" -- cgit v1.2.1