From: Rene Stadler <mail@renestadler.de>
Date: Sun, 13 Apr 2008 18:50:05 +0000 (+0000)
Subject: gst/gsttaglist.h: Fix description to match the order in the table (#512577).
X-Git-Tag: RELEASE-0_10_20~140
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7323fccbcc04cc6f85494100c59c57a76aac22b9;p=platform%2Fupstream%2Fgstreamer.git

gst/gsttaglist.h: Fix description to match the order in the table (#512577).

Original commit message from CVS:
Patch by: Rene Stadler <mail at renestadler de>
* gst/gsttaglist.h:
Fix description to match the order in the table (#512577).
---

diff --git a/ChangeLog b/ChangeLog
index 9753f6e..bc34d6b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2008-04-13  Tim-Philipp Müller  <tim at centricular dot net>
 
+	Patch by: Rene Stadler <mail at renestadler de>
+
+	* gst/gsttaglist.h:
+	  Fix description to match the order in the table (#512577).
+  
+2008-04-13  Tim-Philipp Müller  <tim at centricular dot net>
+
 	Patch by: Kwang Yul Seo  <kwangyul.seo gmail com>
 
 	* libs/gst/net/gstnettimepacket.h:
diff --git a/gst/gsttaglist.h b/gst/gsttaglist.h
index f9162cb..dd0c967 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.
  *
  * <table frame="all" colsep="1" rowsep="1">
  *   <title>merge mode</title>