diff options
author | Benjamin Otte <otte@gnome.org> | 2003-10-28 20:52:41 +0000 |
---|---|---|
committer | Benjamin Otte <otte@gnome.org> | 2003-10-28 20:52:41 +0000 |
commit | 5bb80c9f5359a446d52ad7824095ae4c67bf3cdf (patch) | |
tree | 389f062ecc5627e362c48b89fda7257d10fa8d8c /ext/mplex | |
parent | 680f08e33306ff907e31b3c9db70e132fc9a5158 (diff) | |
download | gst-plugins-bad-5bb80c9f5359a446d52ad7824095ae4c67bf3cdf.tar.gz gst-plugins-bad-5bb80c9f5359a446d52ad7824095ae4c67bf3cdf.tar.bz2 gst-plugins-bad-5bb80c9f5359a446d52ad7824095ae4c67bf3cdf.zip |
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
Diffstat (limited to 'ext/mplex')
-rw-r--r-- | ext/mplex/gstmplex.cc | 4 | ||||
-rw-r--r-- | ext/mplex/gstmplex.h | 2 |
2 files changed, 3 insertions, 3 deletions
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 <stdlib.h> #include <gst/gst.h> -#include <gst/gstbytestream.h> +#include <gst/bytestream.h> #include "outputstream.hh" #include "bits.hh" |