summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilippe Normand <philn@igalia.com>2015-10-21 16:21:45 +0200
committerTim-Philipp Müller <tim@centricular.com>2016-04-06 11:28:11 +0100
commit79fa491070e250564334b4ada6380f212f19f854 (patch)
treefb71cce6eab90bb0894d4ad16f9c950723fc3c33
parent745f3ade6f75115c38f42cbb48a68e12d12476cb (diff)
downloadgstreamer-plugins-good-79fa491070e250564334b4ada6380f212f19f854.tar.gz
qtdemux: read saio aux_info_type as a FOURCC
https://bugzilla.gnome.org/show_bug.cgi?id=756897
-rw-r--r--gst/isomp4/qtdemux.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/gst/isomp4/qtdemux.c b/gst/isomp4/qtdemux.c
index 6bf31f7d3..f8bc4f5c2 100644
--- a/gst/isomp4/qtdemux.c
+++ b/gst/isomp4/qtdemux.c
@@ -3114,6 +3114,7 @@ qtdemux_parse_saio (GstQTDemux * qtdemux, QtDemuxStream * stream,
guint32 entry_count;
guint32 off_32;
guint64 off_64;
+ const guint8 *aux_info_type_data = NULL;
g_return_val_if_fail (qtdemux != NULL, FALSE);
g_return_val_if_fail (stream != NULL, FALSE);
@@ -3127,8 +3128,11 @@ qtdemux_parse_saio (GstQTDemux * qtdemux, QtDemuxStream * stream,
return FALSE;
if (flags & 0x1) {
- if (!gst_byte_reader_get_uint32_be (br, &aux_info_type))
+
+ if (!gst_byte_reader_get_data (br, 4, &aux_info_type_data))
return FALSE;
+ aux_info_type = QT_FOURCC (aux_info_type_data);
+
if (!gst_byte_reader_get_uint32_be (br, &aux_info_type_parameter))
return FALSE;
} else if (stream->protected) {