summaryrefslogtreecommitdiffstats
path: root/ext/jpeg/gstjpeg.c
diff options
context:
space:
mode:
authorWim Taymans <wim.taymans@gmail.com>2006-03-03 15:50:40 +0000
committerWim Taymans <wim.taymans@gmail.com>2006-03-03 15:50:40 +0000
commit188bd155cde994b5c2a69b1a25a900c8b30d1608 (patch)
treedb7cab9fcb72f9aedf01f0224609061ae5283a9c /ext/jpeg/gstjpeg.c
parente85d1638c3e2199998ed8a31af1a2c654354fcba (diff)
docs/plugins/: Added smoke and jpeg to the docs.
Original commit message from CVS: * docs/plugins/Makefile.am: * docs/plugins/gst-plugins-good-plugins-docs.sgml: * docs/plugins/gst-plugins-good-plugins-sections.txt: * docs/plugins/gst-plugins-good-plugins.hierarchy: Added smoke and jpeg to the docs. * ext/jpeg/Makefile.am: * ext/jpeg/gstjpeg.c: (plugin_init): * ext/jpeg/gstjpegdec.c: (gst_jpeg_dec_chain): * ext/jpeg/gstjpegenc.h: * ext/jpeg/gstsmokedec.c: (gst_smokedec_init), (gst_smokedec_chain): * ext/jpeg/gstsmokedec.h: * ext/jpeg/gstsmokeenc.c: (gst_smokeenc_chain): * ext/jpeg/gstsmokeenc.h: * ext/jpeg/smokecodec.h: Port smokedec (fixes #331905). Added some docs. Some cleanups.
Diffstat (limited to 'ext/jpeg/gstjpeg.c')
-rw-r--r--ext/jpeg/gstjpeg.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/ext/jpeg/gstjpeg.c b/ext/jpeg/gstjpeg.c
index 43d7cdf7..bfb62549 100644
--- a/ext/jpeg/gstjpeg.c
+++ b/ext/jpeg/gstjpeg.c
@@ -27,11 +27,11 @@
#include "gstjpegdec.h"
#include "gstjpegenc.h"
#include "gstsmokeenc.h"
-/*
#include "gstsmokedec.h"
-
+#if 0
static GstStaticCaps smoke_caps = GST_STATIC_CAPS ("video/x-smoke");
+
#define SMOKE_CAPS (gst_static_caps_get(&smoke_caps))
static void
smoke_type_find (GstTypeFind * tf, gpointer private)
@@ -46,7 +46,7 @@ smoke_type_find (GstTypeFind * tf, gpointer private)
gst_type_find_suggest (tf, GST_TYPE_FIND_MAXIMUM, SMOKE_CAPS);
}
}
-*/
+#endif
static gboolean
plugin_init (GstPlugin * plugin)
@@ -63,15 +63,16 @@ plugin_init (GstPlugin * plugin)
if (!gst_element_register (plugin, "smokeenc", GST_RANK_PRIMARY,
GST_TYPE_SMOKEENC))
return FALSE;
-/*
+
if (!gst_element_register (plugin, "smokedec", GST_RANK_PRIMARY,
GST_TYPE_SMOKEDEC))
- return FALSE;
+ return FALSE;
+#if 0
if (!gst_type_find_register (plugin, "video/x-smoke", GST_RANK_PRIMARY,
smoke_type_find, NULL, SMOKE_CAPS, NULL))
return FALSE;
-*/
+#endif
return TRUE;
}