projects
/
platform
/
upstream
/
gstreamer.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
77b23ea
)
pbutils: Avoid assertion describing raw audio caps without format
author
Thibault Saunier
<tsaunier@igalia.com>
Mon, 30 Apr 2018 15:17:22 +0000
(17:17 +0200)
committer
Thibault Saunier
<tsaunier@igalia.com>
Tue, 1 May 2018 19:15:25 +0000
(21:15 +0200)
We used to get:
gst_audio_format_from_string: assertion 'format != NULL' failed
gst-libs/gst/pbutils/descriptions.c
patch
|
blob
|
history
diff --git
a/gst-libs/gst/pbutils/descriptions.c
b/gst-libs/gst/pbutils/descriptions.c
index
383bb1c
..
7a90381
100644
(file)
--- a/
gst-libs/gst/pbutils/descriptions.c
+++ b/
gst-libs/gst/pbutils/descriptions.c
@@
-823,11
+823,12
@@
format_info_get_desc (const FormatInfo * info, const GstCaps * caps)
gint depth = 0;
gboolean is_float;
const gchar *str;
- GstAudioFormat format;
+ GstAudioFormat format
= GST_AUDIO_FORMAT_UNKNOWN
;
const GstAudioFormatInfo *finfo;
str = gst_structure_get_string (s, "format");
- format = gst_audio_format_from_string (str);
+ if (str)
+ format = gst_audio_format_from_string (str);
if (format == GST_AUDIO_FORMAT_UNKNOWN)
return g_strdup (_("Uncompressed audio"));