From 7cc1cf7dbba5bdab0475c97dc7aeb2e036c77980 Mon Sep 17 00:00:00 2001
From: Tim-Philipp Müller <tim@centricular.net>
Date: Mon, 8 Aug 2005 12:13:08 +0000
Subject: Port jpegdec to 0.9; handles 'progressive loading' now, ie. input
 does no longer need to be one single buffer.

Original commit message from CVS:
* configure.ac:
* ext/Makefile.am:
* ext/jpeg/Makefile.am:
* ext/jpeg/gstjpeg.c: (plugin_init):
* ext/jpeg/gstjpegdec.c: (gst_jpeg_dec_get_type),
(gst_jpeg_dec_finalize), (gst_jpeg_dec_base_init),
(gst_jpeg_dec_class_init), (gst_jpeg_dec_fill_input_buffer),
(gst_jpeg_dec_init_source), (gst_jpeg_dec_skip_input_data),
(gst_jpeg_dec_resync_to_restart), (gst_jpeg_dec_term_source),
(gst_jpeg_dec_my_output_message), (gst_jpeg_dec_my_emit_message),
(gst_jpeg_dec_my_error_exit), (gst_jpeg_dec_init),
(is_jpeg_start_marker), (is_jpeg_end_marker),
(gst_jpeg_dec_find_jpeg_header), (gst_jpeg_dec_ensure_header),
(gst_jpeg_dec_have_end_marker),
(gst_jpeg_dec_parse_tag_has_entropy_segment),
(gst_jpeg_dec_parse_image_data), (gst_jpeg_dec_chain),
(gst_jpeg_dec_change_state):
* ext/jpeg/gstjpegdec.h:
Port jpegdec to 0.9; handles 'progressive loading' now, ie. input does
no longer need to be one single buffer.
---
 ext/jpeg/gstjpeg.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'ext/jpeg/gstjpeg.c')

diff --git a/ext/jpeg/gstjpeg.c b/ext/jpeg/gstjpeg.c
index 63c54637..c6fa7a18 100644
--- a/ext/jpeg/gstjpeg.c
+++ b/ext/jpeg/gstjpeg.c
@@ -19,9 +19,14 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
+
 #include <string.h>
 
+#include <gst/gst.h>
+
 #include "gstjpegdec.h"
+
+#if 0
 #include "gstjpegenc.h"
 #include "gstsmokeenc.h"
 #include "gstsmokedec.h"
@@ -42,18 +47,22 @@ 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)
 {
+#if 0
   if (!gst_element_register (plugin, "jpegenc", GST_RANK_NONE,
           GST_TYPE_JPEGENC))
     return FALSE;
+#endif
 
   if (!gst_element_register (plugin, "jpegdec", GST_RANK_PRIMARY,
-          GST_TYPE_JPEGDEC))
+          GST_TYPE_JPEG_DEC))
     return FALSE;
 
+#if 0
   if (!gst_element_register (plugin, "smokeenc", GST_RANK_PRIMARY,
           GST_TYPE_SMOKEENC))
     return FALSE;
@@ -65,6 +74,7 @@ plugin_init (GstPlugin * plugin)
   if (!gst_type_find_register (plugin, "video/x-smoke", GST_RANK_PRIMARY,
           smoke_type_find, NULL, SMOKE_CAPS, NULL))
     return FALSE;
+#endif
 
   return TRUE;
 }
-- 
cgit