Commit 81c7f2c4 authored by Tim-Philipp Müller's avatar Tim-Philipp Müller 🐠
Browse files

gst/qtdemux/qtdemux.c: Fix non-working redirects from inetfilm.com (handle...

gst/qtdemux/qtdemux.c: Fix non-working redirects from inetfilm.com (handle 'alis' reference data type as well). Fixes...

Original commit message from CVS:
* gst/qtdemux/qtdemux.c: (qtdemux_parse_tree):
Fix non-working redirects from inetfilm.com (handle 'alis' reference
data type as well). Fixes #378613.
parent 0d3b0236
......@@ -3134,9 +3134,34 @@ qtdemux_parse_tree (GstQTDemux * qtdemux)
rdrf = qtdemux_tree_get_child_by_type (rmda, FOURCC_rdrf);
if (rdrf) {
ref.location = g_strdup ((gchar *) rdrf->data + 20);
GST_LOG ("New location: %s", ref.location);
redirects = g_list_prepend (redirects, g_memdup (&ref, sizeof (ref)));
guint32 ref_type;
guint8 *ref_data;
ref_type = GST_READ_UINT32_LE ((guint8 *) rdrf->data + 12);
ref_data = (guint8 *) rdrf->data + 20;
if (ref_type == GST_MAKE_FOURCC ('a', 'l', 'i', 's')) {
guint record_len, record_version, fn_len;
/* MacOSX alias record, google for alias-layout.txt */
record_len = GST_READ_UINT16_BE (ref_data + 4);
record_version = GST_READ_UINT16_BE (ref_data + 4 + 2);
fn_len = GST_READ_UINT8 (ref_data + 50);
if (record_len > 50 && record_version == 2 && fn_len > 0) {
ref.location = g_strndup ((gchar *) ref_data + 51, fn_len);
}
} else if (ref_type == GST_MAKE_FOURCC ('u', 'r', 'l', ' ')) {
ref.location = g_strdup ((gchar *) ref_data);
} else {
GST_DEBUG ("unknown rdrf reference type %" GST_FOURCC_FORMAT,
GST_FOURCC_ARGS (ref_type));
}
if (ref.location != NULL) {
GST_INFO ("New location: %s", ref.location);
redirects =
g_list_prepend (redirects, g_memdup (&ref, sizeof (ref)));
} else {
GST_WARNING ("Failed to extract redirect location from rdrf atom");
}
}
/* look for others */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment