diff options
| author | Vincent Penquerc'h <vincent.penquerch@collabora.co.uk> | 2017-06-05 15:31:52 +0100 |
|---|---|---|
| committer | Sebastian Dröge <sebastian@centricular.com> | 2017-06-12 10:04:16 +0300 |
| commit | 04265cafa2f578b2dc71b732a474452727d94e21 (patch) | |
| tree | df3bd4b968b6520bc7a47253e1909b729ad1e39c | |
| parent | 1d777bf037cd8b114df48338aa9749662eed24ba (diff) | |
| download | gstreamer-plugins-bad-04265cafa2f578b2dc71b732a474452727d94e21.tar.gz | |
jpeg2000sampling: fix critical when sampling is missing from caps
This can happen with real files
| -rw-r--r-- | gst-libs/gst/codecparsers/gstjpeg2000sampling.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/gst-libs/gst/codecparsers/gstjpeg2000sampling.c b/gst-libs/gst/codecparsers/gstjpeg2000sampling.c index dba1c50fd..e8769493b 100644 --- a/gst-libs/gst/codecparsers/gstjpeg2000sampling.c +++ b/gst-libs/gst/codecparsers/gstjpeg2000sampling.c @@ -45,7 +45,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); |