summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--gst/qtdemux/qtdemux.c11
-rw-r--r--gst/qtdemux/qtdemux_fourcc.h2
3 files changed, 19 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 298e47ee..d4e23c08 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,12 @@
2008-08-04 Stefan Kost <ensonic@users.sf.net>
* gst/qtdemux/qtdemux.c:
+ * gst/qtdemux/qtdemux_fourcc.h:
+ Add keyword tag support. Fixes #520694 for qtdemux.
+
+2008-08-04 Stefan Kost <ensonic@users.sf.net>
+
+ * gst/qtdemux/qtdemux.c:
Add support for tmpo tag (BPM).
2008-08-03 Sebastian Dröge <sebastian.droege@collabora.co.uk>
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')