summaryrefslogtreecommitdiffstats
path: root/gst/matroska
diff options
context:
space:
mode:
authorSebastian Dröge <slomo@circular-chaos.org>2008-06-16 11:34:54 +0000
committerSebastian Dröge <slomo@circular-chaos.org>2008-06-16 11:34:54 +0000
commita5f813b90a933dcb638650ea9dc6656de334c0f7 (patch)
tree781641ecaefcb9860b16c29385110ab74fc8da41 /gst/matroska
parent350df6326da8d16dbf516e823cb80a3313bd121a (diff)
gst/matroska/matroska-demux.c: When comparing index elements with the same time compare their block number.
Original commit message from CVS: * gst/matroska/matroska-demux.c: (gst_matroska_index_compare): When comparing index elements with the same time compare their block number.
Diffstat (limited to 'gst/matroska')
-rw-r--r--gst/matroska/matroska-demux.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/gst/matroska/matroska-demux.c b/gst/matroska/matroska-demux.c
index a7a715ff..890d2978 100644
--- a/gst/matroska/matroska-demux.c
+++ b/gst/matroska/matroska-demux.c
@@ -2034,6 +2034,10 @@ gst_matroska_index_compare (GstMatroskaIndex * i1, GstMatroskaIndex * i2)
return -1;
else if (i1->time > i2->time)
return 1;
+ else if (i1->block < i2->block)
+ return -1;
+ else if (i1->block > i2->block)
+ return 1;
else
return 0;
}
@@ -2568,8 +2572,11 @@ gst_matroska_demux_parse_attached_file (GstMatroskaDemux * demux,
if (filename && mimetype && data && datalen > 0) {
GstTagImageType image_type = GST_TAG_IMAGE_TYPE_NONE;
+
GstBuffer *tagbuffer = NULL;
+
GstCaps *caps;
+
gchar *filename_lc = g_utf8_strdown (filename, -1);
GST_DEBUG_OBJECT (demux, "Creating tag for attachment with filename '%s', "