summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog9
-rw-r--r--ext/gdk_pixbuf/gstgdkpixbuf.c2
2 files changed, 10 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 25d96b95..0058f59f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
2006-04-18 Tim-Philipp Müller <tim at centricular dot net>
+ * ext/gdk_pixbuf/gstgdkpixbuf.c:
+ Leave JPEG decoding to our jpegdec plugin. gdkpixbufdec cannot
+ handle MJPEG streams and might be autoplugged for those if the
+ user doesn't have jpegdec installed (resulting in a cryptic error
+ message about huffman tables). Better to disable JPEG decoding here
+ and let the user figure out that she needs to install jpegdec.
+
+2006-04-18 Tim-Philipp Müller <tim at centricular dot net>
+
* ext/gdk_pixbuf/gstgdkpixbuf.c: (gst_gdk_pixbuf_sink_setcaps),
(gst_gdk_pixbuf_class_init), (gst_gdk_pixbuf_init),
(gst_gdk_pixbuf_flush), (gst_gdk_pixbuf_chain):
diff --git a/ext/gdk_pixbuf/gstgdkpixbuf.c b/ext/gdk_pixbuf/gstgdkpixbuf.c
index c29ae468..d0e6fc35 100644
--- a/ext/gdk_pixbuf/gstgdkpixbuf.c
+++ b/ext/gdk_pixbuf/gstgdkpixbuf.c
@@ -48,7 +48,7 @@ static GstStaticPadTemplate gst_gdk_pixbuf_sink_template =
GST_PAD_SINK,
GST_PAD_ALWAYS,
GST_STATIC_CAPS ("image/png; "
- "image/jpeg; "
+ /* "image/jpeg; " disabled because we can't handle MJPEG */
"image/gif; "
"image/x-icon; "
"application/x-navi-animation; "