summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilippe Normand <philn@igalia.com>2015-10-21 16:21:45 +0200
committerSebastian Dröge <sebastian@centricular.com>2016-02-24 10:54:23 +0200
commit459ef195bbc77cee5e407facc3172b77cb29d9a3 (patch)
tree10a48e4ec7a4d24f8522f49bbfd178d20cd88894
parent49f46319097fd723909a6eeb749ead9fbd497806 (diff)
downloadgstreamer-plugins-good-459ef195bbc77cee5e407facc3172b77cb29d9a3.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 ea6c4882c..20618a6d4 100644
--- a/gst/isomp4/qtdemux.c
+++ b/gst/isomp4/qtdemux.c
@@ -3165,6 +3165,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);
@@ -3178,8 +3179,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) {