summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Dröge <slomo@circular-chaos.org>2008-07-14 17:17:47 +0000
committerSebastian Dröge <slomo@circular-chaos.org>2008-07-14 17:17:47 +0000
commit54b1c496d6e14262446a7a4b7fe536371b580b96 (patch)
treee89967f793299d44b22a260e1b612c5f0ed00801
parent20111b55b2d221163262903d135ab733cdd56286 (diff)
gst/debug/gsttaginject.c: Don't pass NULL taglists to gst_tag_list_is_empty().
Original commit message from CVS: * gst/debug/gsttaginject.c: (gst_tag_inject_start): Don't pass NULL taglists to gst_tag_list_is_empty().
-rw-r--r--ChangeLog5
-rw-r--r--gst/debug/gsttaginject.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 6e588cd7..ff74c50d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2008-07-14 Sebastian Dröge <slomo@circular-chaos.org>
+ * gst/debug/gsttaginject.c: (gst_tag_inject_start):
+ Don't pass NULL taglists to gst_tag_list_is_empty().
+
+2008-07-14 Sebastian Dröge <slomo@circular-chaos.org>
+
* tests/check/elements/cmmldec.c: (GST_START_TEST):
* tests/check/elements/rtp-payloading.c: (rtp_pipeline_create),
(rtp_pipeline_run):
diff --git a/gst/debug/gsttaginject.c b/gst/debug/gsttaginject.c
index aee1227f..7e2b81c8 100644
--- a/gst/debug/gsttaginject.c
+++ b/gst/debug/gsttaginject.c
@@ -180,7 +180,7 @@ gst_tag_inject_start (GstBaseTransform * trans)
GstTagInject *self = GST_TAG_INJECT (trans);
/* send tags */
- if (!gst_tag_list_is_empty (self->tags)) {
+ if (self->tags && !gst_tag_list_is_empty (self->tags)) {
gst_element_found_tags (GST_ELEMENT (trans),
gst_tag_list_copy (self->tags));
}