mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-07 07:58:51 +00:00
Code Issues 1 Projects Releases Wiki Activity

gst/gsttaglist.c: Avoid copy of empty taglist.

Browse source 
Original commit message from CVS:
* gst/gsttaglist.c:
Avoid copy of empty taglist.
This commit is contained in:
Stefan Kost 2008-12-16 09:37:53 +00:00
parent f28a2a6cfc
commit 4a162d56ab
2 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2008-12-16 Stefan Kost <ensonic@users.sf.net>
* gst/gsttaglist.c:
Avoid copy of empty taglist.
2008-12-16 Stefan Kost <ensonic@users.sf.net> 2008-12-16 Stefan Kost <ensonic@users.sf.net>
* gst/gsttaglist.c: * gst/gsttaglist.c:

13
gst/gsttaglist.c
View file

@ -692,8 +692,8 @@ GstTagList *
gst_tag_list_merge (const GstTagList * list1, const GstTagList * list2, gst_tag_list_merge (const GstTagList * list1, const GstTagList * list2,
GstTagMergeMode mode) GstTagMergeMode mode)
{ {
const GstTagList *list1_cp, *list2_cp; GstTagList *list1_cp;
GstTagList *ret; const GstTagList *list2_cp;
g_return_val_if_fail (list1 == NULL || GST_IS_TAG_LIST (list1), NULL); g_return_val_if_fail (list1 == NULL || GST_IS_TAG_LIST (list1), NULL);
g_return_val_if_fail (list2 == NULL || GST_IS_TAG_LIST (list2), NULL); g_return_val_if_fail (list2 == NULL || GST_IS_TAG_LIST (list2), NULL);
@ -705,18 +705,15 @@ gst_tag_list_merge (const GstTagList * list1, const GstTagList * list2,
} }
/* create empty list, we need to do this to correctly handling merge modes */ /* create empty list, we need to do this to correctly handling merge modes */
list1_cp = (list1) ? list1 : gst_tag_list_new (); list1_cp = (list1) ? gst_tag_list_copy (list1) : gst_tag_list_new ();
list2_cp = (list2) ? list2 : gst_tag_list_new (); list2_cp = (list2) ? list2 : gst_tag_list_new ();
ret = gst_tag_list_copy (list1_cp); gst_tag_list_insert (list1_cp, list2_cp, mode);
gst_tag_list_insert (ret, list2_cp, mode);
if (!list1)
gst_tag_list_free ((GstTagList *) list1_cp);
if (!list2) if (!list2)
gst_tag_list_free ((GstTagList *) list2_cp); gst_tag_list_free ((GstTagList *) list2_cp);
return ret; return list1_cp;
} }
/** /**