From: <sl...@ke...> - 2008-06-16 11:34:59
|
CVS Root: /cvs/gstreamer Module: gst-plugins-good Changes by: slomo Date: Mon Jun 16 2008 11:35:08 UTC Log message: * gst/matroska/matroska-demux.c: (gst_matroska_index_compare): When comparing index elements with the same time compare their block number. Modified files: . : ChangeLog gst/matroska : matroska-demux.c Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/ChangeLog.diff?r1=1.3553&r2=1.3554 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/gst/matroska/matroska-demux.c.diff?r1=1.110&r2=1.111 ====Begin Diffs==== Index: ChangeLog =================================================================== RCS file: /cvs/gstreamer/gst-plugins-good/ChangeLog,v retrieving revision 1.3553 retrieving revision 1.3554 diff -u -d -r1.3553 -r1.3554 --- ChangeLog 16 Jun 2008 11:31:05 -0000 1.3553 +++ ChangeLog 16 Jun 2008 11:34:53 -0000 1.3554 @@ -1,3 +1,9 @@ +2008-06-16 Sebastian Dröge <sl...@ci...> + + * 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: Index: matroska-demux.c RCS file: /cvs/gstreamer/gst-plugins-good/gst/matroska/matroska-demux.c,v retrieving revision 1.110 retrieving revision 1.111 diff -u -d -r1.110 -r1.111 --- matroska-demux.c 16 Jun 2008 11:31:06 -0000 1.110 +++ matroska-demux.c 16 Jun 2008 11:34:54 -0000 1.111 @@ -2034,6 +2034,10 @@ 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 @@ 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', " |