diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | gst/matroska/matroska-demux.c | 7 |
2 files changed, 13 insertions, 0 deletions
@@ -1,3 +1,9 @@ +2008-06-16 Sebastian Dröge <slomo@circular-chaos.org> + + * gst/matroska/matroska-demux.c: (gst_matroska_index_compare): + When comparing index elements with the same time compare their + block number. + 2008-06-16 Tim-Philipp Müller <tim.muller at collabora co uk> * gst/matroska/matroska-demux.c: 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', " |