aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2013-06-26 09:50:44 +0000
committerChristian Grothoff <christian@grothoff.org>2013-06-26 09:50:44 +0000
commit7ce38b08edf8e218637bec6c59760c4cc2dc99b5 (patch)
tree949df6f8846077167d61554aaf53b768e5671796
parent7f6f48305b481b208a2bc2ca9395c77f8204e039 (diff)
downloadlibextractor-7ce38b08edf8e218637bec6c59760c4cc2dc99b5.tar.gz
libextractor-7ce38b08edf8e218637bec6c59760c4cc2dc99b5.zip
-check for NULL to avoid warning
-rw-r--r--src/plugins/gstreamer_extractor.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/plugins/gstreamer_extractor.c b/src/plugins/gstreamer_extractor.c
index ff98da4..190cf9d 100644
--- a/src/plugins/gstreamer_extractor.c
+++ b/src/plugins/gstreamer_extractor.c
@@ -1031,7 +1031,6 @@ send_structure_foreach (GQuark field_id,
1031 struct PrivStruct *ps = user_data; 1031 struct PrivStruct *ps = user_data;
1032 gchar *str; 1032 gchar *str;
1033 const gchar *field_name = g_quark_to_string (field_id); 1033 const gchar *field_name = g_quark_to_string (field_id);
1034 const gchar *type_name = g_type_name (G_VALUE_TYPE (value));
1035 GType gst_fraction = GST_TYPE_FRACTION; 1034 GType gst_fraction = GST_TYPE_FRACTION;
1036 GQuark *quark; 1035 GQuark *quark;
1037 1036
@@ -1398,8 +1397,9 @@ send_tag_foreach (const GstTagList * tags,
1398 1397
1399 mime_type = gst_structure_get_name (gst_caps_get_structure (caps, 0)); 1398 mime_type = gst_structure_get_name (gst_caps_get_structure (caps, 0));
1400 info = gst_sample_get_info (sample); 1399 info = gst_sample_get_info (sample);
1401 1400
1402 if (!gst_structure_get (info, "image-type", GST_TYPE_TAG_IMAGE_TYPE, &imagetype, NULL)) 1401 if ( (NULL == info) ||
1402 (!gst_structure_get (info, "image-type", GST_TYPE_TAG_IMAGE_TYPE, &imagetype, NULL)) )
1403 le_type = EXTRACTOR_METATYPE_PICTURE; 1403 le_type = EXTRACTOR_METATYPE_PICTURE;
1404 else 1404 else
1405 { 1405 {
@@ -1707,11 +1707,9 @@ send_toc_tags_foreach (const GstTagList * tags,
1707 struct PrivStruct *ps = user_data; 1707 struct PrivStruct *ps = user_data;
1708 GValue val = { 0 }; 1708 GValue val = { 0 };
1709 gchar *topen, *str, *tclose; 1709 gchar *topen, *str, *tclose;
1710 const gchar *type_name;
1711 GType gst_fraction = GST_TYPE_FRACTION; 1710 GType gst_fraction = GST_TYPE_FRACTION;
1712 1711
1713 gst_tag_list_copy_value (&val, tags, tag); 1712 gst_tag_list_copy_value (&val, tags, tag);
1714 type_name = g_type_name (G_VALUE_TYPE (&val));
1715 switch (G_VALUE_TYPE (&val)) 1713 switch (G_VALUE_TYPE (&val))
1716 { 1714 {
1717 case G_TYPE_STRING: 1715 case G_TYPE_STRING: