diff options
| author | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2013-02-14 14:13:27 +0000 |
|---|---|---|
| committer | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2013-02-14 14:15:34 +0000 |
| commit | 24cdefcb755543c397ae9dde5d59ff0b697f8dcd (patch) | |
| tree | 6a32ae6a7708204fe2ab3a02b7d574a3d08c0dbc | |
| parent | af5c3fe31277ba0dd730a9b9357b2d24093a4365 (diff) | |
jpegdec: remove sof-marker from template caps for now
Now that the subset check actually works, this breaks
things with demuxers that don't put a "sof-marker"
in their jpeg caps, and we don't have a good parser
to plug either yet.
| -rw-r--r-- | ext/jpeg/gstjpegdec.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ext/jpeg/gstjpegdec.c b/ext/jpeg/gstjpegdec.c index 2524406fd..953e15ca7 100644 --- a/ext/jpeg/gstjpegdec.c +++ b/ext/jpeg/gstjpegdec.c @@ -75,6 +75,8 @@ GST_STATIC_PAD_TEMPLATE ("src", /* *INDENT-ON* */ /* FIXME: sof-marker is for IJG libjpeg 8, should be different for 6.2 */ +/* FIXME: add back "sof-marker = (int) { 0, 1, 2, 5, 6, 7, 9, 10, 13, 14 }" + * once we have a parser and/or demuxer set caps properly */ static GstStaticPadTemplate gst_jpeg_dec_sink_pad_template = GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_SINK, @@ -82,8 +84,7 @@ GST_STATIC_PAD_TEMPLATE ("sink", GST_STATIC_CAPS ("image/jpeg, " "width = (int) [ " G_STRINGIFY (MIN_WIDTH) ", " G_STRINGIFY (MAX_WIDTH) " ], " "height = (int) [ " G_STRINGIFY (MIN_HEIGHT) ", " - G_STRINGIFY (MAX_HEIGHT) " ], " - "sof-marker = (int) { 0, 1, 2, 5, 6, 7, 9, 10, 13, 14 }") + G_STRINGIFY (MAX_HEIGHT) " ] ") ); GST_DEBUG_CATEGORY_STATIC (jpeg_dec_debug); |