jpeg2000sampling: fix critical when sampling is missing from caps
authorVincent Penquerc'h <vincent.penquerch@collabora.co.uk>
Mon, 5 Jun 2017 14:31:52 +0000 (15:31 +0100)
committerSebastian Dröge <sebastian@centricular.com>
Mon, 12 Jun 2017 07:03:24 +0000 (10:03 +0300)
This can happen with real files

gst-libs/gst/codecparsers/gstjpeg2000sampling.c

index ab8321f..543282d 100644 (file)
@@ -46,7 +46,8 @@ GstJPEG2000Sampling
 gst_jpeg2000_sampling_from_string (const gchar * sampling_string)
 {
   GstJPEG2000Sampling i;
-  g_return_val_if_fail (sampling_string != NULL, GST_JPEG2000_SAMPLING_NONE);
+  if (sampling_string == NULL)
+    return GST_JPEG2000_SAMPLING_NONE;
   for (i = 0; i < G_N_ELEMENTS (gst_jpeg2000_sampling_strings); ++i) {
     if (!g_strcmp0 (sampling_string, gst_jpeg2000_sampling_strings[i]))
       return (i + 1);