summaryrefslogtreecommitdiffstats
path: root/gst
diff options
context:
space:
mode:
authorStefan Kost <ensonic@users.sourceforge.net>2008-08-04 07:17:38 +0000
committerStefan Kost <ensonic@users.sourceforge.net>2008-08-04 07:17:38 +0000
commit115636d6d6cbb2d65c4cfaf2298050af73ee816a (patch)
tree05bf1544ca12cd0bd195f78ec5e1da7326e1126d /gst
parentaa7a44190ee2be06e032034e312d37f6838c7b31 (diff)
gst/qtdemux/: Add keyword tag support. Fixes #520694 for qtdemux.
Original commit message from CVS: * gst/qtdemux/qtdemux.c: * gst/qtdemux/qtdemux_fourcc.h: Add keyword tag support. Fixes #520694 for qtdemux.
Diffstat (limited to 'gst')
-rw-r--r--gst/qtdemux/qtdemux.c11
-rw-r--r--gst/qtdemux/qtdemux_fourcc.h2
2 files changed, 13 insertions, 0 deletions
diff --git a/gst/qtdemux/qtdemux.c b/gst/qtdemux/qtdemux.c
index e940bafd..32cee0e5 100644
--- a/gst/qtdemux/qtdemux.c
+++ b/gst/qtdemux/qtdemux.c
@@ -4033,6 +4033,17 @@ qtdemux_parse_udta (GstQTDemux * qtdemux, GNode * udta)
if (node) {
qtdemux_tag_add_tmpo (qtdemux, GST_TAG_BEATS_PER_MINUTE, node);
}
+
+ node = qtdemux_tree_get_child_by_type (ilst, FOURCC_keyw);
+ if (node) {
+ qtdemux_tag_add_str (qtdemux, GST_TAG_KEYWORDS, node);
+ } else {
+ node = qtdemux_tree_get_child_by_type (ilst, FOURCC_kywd);
+ if (node) {
+ qtdemux_tag_add_str (qtdemux, GST_TAG_KEYWORDS, node);
+ }
+ }
+
}
typedef struct
diff --git a/gst/qtdemux/qtdemux_fourcc.h b/gst/qtdemux/qtdemux_fourcc.h
index a721ecf4..96ee218e 100644
--- a/gst/qtdemux/qtdemux_fourcc.h
+++ b/gst/qtdemux/qtdemux_fourcc.h
@@ -130,6 +130,8 @@ G_BEGIN_DECLS
#define FOURCC_url_ GST_MAKE_FOURCC('u','r','l',' ')
#define FOURCC_frma GST_MAKE_FOURCC('f','r','m','a')
#define FOURCC_ctts GST_MAKE_FOURCC('c','t','t','s')
+#define FOURCC_keyw GST_MAKE_FOURCC('k','e','y','w')
+#define FOURCC_kywd GST_MAKE_FOURCC('k','y','w','d')
/* Xiph fourcc */
#define FOURCC_XiTh GST_MAKE_FOURCC('X','i','T','h')