From 7323fccbcc04cc6f85494100c59c57a76aac22b9 Mon Sep 17 00:00:00 2001 From: Rene Stadler Date: Sun, 13 Apr 2008 18:50:05 +0000 Subject: [PATCH] gst/gsttaglist.h: Fix description to match the order in the table (#512577). Original commit message from CVS: Patch by: Rene Stadler * gst/gsttaglist.h: Fix description to match the order in the table (#512577). --- ChangeLog | 7 +++++++ gst/gsttaglist.h | 11 +++++------ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9753f6ea6d..bc34d6b10e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2008-04-13 Tim-Philipp Müller + + Patch by: Rene Stadler + + * gst/gsttaglist.h: + Fix description to match the order in the table (#512577). + 2008-04-13 Tim-Philipp Müller Patch by: Kwang Yul Seo diff --git a/gst/gsttaglist.h b/gst/gsttaglist.h index f9162cbaaa..dd0c967939 100644 --- a/gst/gsttaglist.h +++ b/gst/gsttaglist.h @@ -40,12 +40,11 @@ G_BEGIN_DECLS * @GST_TAG_MERGE_COUNT: the number of merge modes * * The different tag merging modes are basically replace, overwrite and append, - * but they can be seen from two directions. - * Given two taglists: A - the one that are supplied to - * gst_tag_setter_merge_tags() or gst_tag_setter_add_tags() and B - the tags - * already in the element, how are the tags merged? In the table below this is - * shown for the cases that a tag exists in the list (A) or does not exists (!A) - * and combination thereof. + * but they can be seen from two directions. Given two taglists: (A) the tags + * already in the element and (B) the ones that are supplied to + * gst_tag_setter_merge_tags() or gst_tag_setter_add_tags(), how are these tags + * merged? In the table below this is shown for the cases that a tag exists in + * the list (A) or does not exists (!A) and combinations thereof. * * * merge mode