summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
m---------common0
-rw-r--r--ext/jpeg/gstjpeg.c25
3 files changed, 5 insertions, 25 deletions
diff --git a/ChangeLog b/ChangeLog
index d7461352..80e5ac84 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-02-25 Sebastian Dröge <slomo@circular-chaos.org>
+
+ * ext/jpeg/gstjpeg.c: (plugin_init):
+ Remove (commented out) smoke typefinder. This is in base now.
+
2008-02-23 Jan Schmidt <jan.schmidt@sun.com>
* gst/goom2k1/Makefile.am:
diff --git a/common b/common
-Subproject ce296a6e04ac824523dbf7bf836f91e14012ab9
+Subproject a574e6214b06fcbdfc00e952e2f3edc06997ee9
diff --git a/ext/jpeg/gstjpeg.c b/ext/jpeg/gstjpeg.c
index bfb62549..ddb10152 100644
--- a/ext/jpeg/gstjpeg.c
+++ b/ext/jpeg/gstjpeg.c
@@ -29,25 +29,6 @@
#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)
-{
- guint8 *data = gst_type_find_peek (tf, 0, 6);
-
- if (data) {
- if (data[0] != 0x80)
- return;
- if (memcmp (&data[1], "smoke", 5) != 0)
- return;
- gst_type_find_suggest (tf, GST_TYPE_FIND_MAXIMUM, SMOKE_CAPS);
- }
-}
-#endif
-
static gboolean
plugin_init (GstPlugin * plugin)
{
@@ -68,12 +49,6 @@ plugin_init (GstPlugin * plugin)
GST_TYPE_SMOKEDEC))
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;
}