summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2014-09-04 16:57:02 +0200
committerSebastian Dröge <sebastian@centricular.com>2014-09-05 10:49:16 +0300
commit8dff7bb38db2932605df604dc08f55a8de290b61 (patch)
tree84b66e9a9a40644a9e35c93301ebcdd43b7d872c
parent2863d9ae0039ddd27b4b98ceaaa1f4ed3a2eb3d6 (diff)
asfdemux: add ASF_OBJ_METADATA_LIBRARY_OBJECT
We can safely ignore those but best to claim to understand this object type so we don't raise a warning. https://bugzilla.gnome.org/show_bug.cgi?id=736060
-rw-r--r--gst/asfdemux/asfheaders.c3
-rw-r--r--gst/asfdemux/asfheaders.h3
-rw-r--r--gst/asfdemux/gstasfdemux.c1
3 files changed, 6 insertions, 1 deletions
diff --git a/gst/asfdemux/asfheaders.c b/gst/asfdemux/asfheaders.c
index f1488be0..b8e8a3cb 100644
--- a/gst/asfdemux/asfheaders.c
+++ b/gst/asfdemux/asfheaders.c
@@ -171,6 +171,9 @@ const ASFGuidHash asf_object_guids[] = {
{ASF_OBJ_UNKNOWN_ENCRYPTION_OBJECT, "ASF_OBJ_UNKNOWN_ENCRYPTION_OBJECT",
{0x9a04f079, 0x42869840, 0x5be692ab, 0x955f88e0}
},
+ {ASF_OBJ_METADATA_LIBRARY_OBJECT, "ASF_OBJ_METADATA_LIBRARY_OBJECT",
+ {0x44231c94, 0x49d19498, 0x131d41a1, 0x5470454e}
+ },
{ASF_OBJ_UNDEFINED, "ASF_OBJ_UNDEFINED",
{0, 0, 0, 0}
}
diff --git a/gst/asfdemux/asfheaders.h b/gst/asfdemux/asfheaders.h
index 4b65b95e..9e8d972e 100644
--- a/gst/asfdemux/asfheaders.h
+++ b/gst/asfdemux/asfheaders.h
@@ -68,7 +68,8 @@ typedef enum {
ASF_OBJ_DIGITAL_SIGNATURE_OBJECT,
ASF_OBJ_SCRIPT_COMMAND,
ASF_OBJ_MARKER,
- ASF_OBJ_UNKNOWN_ENCRYPTION_OBJECT
+ ASF_OBJ_UNKNOWN_ENCRYPTION_OBJECT,
+ ASF_OBJ_METADATA_LIBRARY_OBJECT,
} AsfObjectID;
typedef enum {
diff --git a/gst/asfdemux/gstasfdemux.c b/gst/asfdemux/gstasfdemux.c
index d9e1c19f..e140b4ea 100644
--- a/gst/asfdemux/gstasfdemux.c
+++ b/gst/asfdemux/gstasfdemux.c
@@ -4073,6 +4073,7 @@ gst_asf_demux_process_object (GstASFDemux * demux, guint8 ** p_data,
case ASF_OBJ_INDEX_PARAMETERS:
case ASF_OBJ_STREAM_PRIORITIZATION:
case ASF_OBJ_SCRIPT_COMMAND:
+ case ASF_OBJ_METADATA_LIBRARY_OBJECT:
default:
/* Unknown/unhandled object, skip it and hope for the best */
GST_INFO ("%s: skipping object", demux->objpath);