summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
m---------common0
-rw-r--r--gst/matroska/matroska-demux.c6
3 files changed, 7 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 84ffb081..1859ae36 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-12-08 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
+
+ * gst/matroska/matroska-demux.c:
+ (gst_matroska_demux_handle_src_query):
+ Don't set DEFAULT, unsupported - makes length display incorrectly
+ in some cases.
+
2004-12-07 Christian Fredrik Kalager Schaller <set EMAIL_ADDRESS environment variable>
Woooho Monoscope is now effectivly LGPL licensed
diff --git a/common b/common
-Subproject ded6dc5186cb7f8c64cb06a8591b9f787122c6f
+Subproject 8404d8841f5fd58fe31de09090867115e97c526
diff --git a/gst/matroska/matroska-demux.c b/gst/matroska/matroska-demux.c
index 5bfcecf5..f46a3b1b 100644
--- a/gst/matroska/matroska-demux.c
+++ b/gst/matroska/matroska-demux.c
@@ -944,9 +944,6 @@ gst_matroska_demux_handle_src_query (GstPad * pad,
switch (type) {
case GST_QUERY_TOTAL:
switch (*format) {
- case GST_FORMAT_DEFAULT:
- *format = GST_FORMAT_TIME;
- /* fall through */
case GST_FORMAT_TIME:
*value = demux->duration;
break;
@@ -958,9 +955,6 @@ gst_matroska_demux_handle_src_query (GstPad * pad,
case GST_QUERY_POSITION:
switch (*format) {
- case GST_FORMAT_DEFAULT:
- *format = GST_FORMAT_TIME;
- /* fall through */
case GST_FORMAT_TIME:
*value = demux->pos;
break;