From cfee7319388dcafac9a5464606341c0d4b589122 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <slomo@circular-chaos.org>
Date: Mon, 25 Feb 2008 06:50:31 +0000
Subject: [PATCH] ext/jpeg/gstjpeg.c: Remove (commented out) smoke typefinder.
 This is in base now.

Original commit message from CVS:
* ext/jpeg/gstjpeg.c: (plugin_init):
Remove (commented out) smoke typefinder. This is in base now.
---
 ChangeLog          |  5 +++++
 common             |  2 +-
 ext/jpeg/gstjpeg.c | 25 -------------------------
 3 files changed, 6 insertions(+), 26 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d746135294..80e5ac8473 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
index ce296a6e04..a574e6214b 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit ce296a6e04ac824523dbf7bf836f91e14012ab9d
+Subproject commit a574e6214b06fcbdfc00e952e2f3edc06997ee93
diff --git a/ext/jpeg/gstjpeg.c b/ext/jpeg/gstjpeg.c
index bfb62549e5..ddb1015258 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;
 }