summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRonald S. Bultje <rbultje@ronald.bitfreak.net>2005-06-30 14:28:14 +0000
committerRonald S. Bultje <rbultje@ronald.bitfreak.net>2005-06-30 14:28:14 +0000
commitdb20692b12e8924d30284ad8320fbb036741c26b (patch)
tree7fa7c0bd001a24c5a8cb8b98b6fd885dcb26fa71
parent94e9812b6bfcf12b9a2d12a737f492f5d05bfe0f (diff)
gst/avi/gstavidemux.c: Compiler pains.
Original commit message from CVS: * gst/avi/gstavidemux.c: (gst_avi_demux_handle_src_query): Compiler pains.
-rw-r--r--ChangeLog5
-rw-r--r--gst/avi/gstavidemux.c5
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 705a9402..ba8041c8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2005-06-30 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
+ * gst/avi/gstavidemux.c: (gst_avi_demux_handle_src_query):
+ Compiler pains.
+
+2005-06-30 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
+
* configure.ac:
* gst/avi/Makefile.am:
* gst/avi/gstavi.c: (plugin_init):
diff --git a/gst/avi/gstavidemux.c b/gst/avi/gstavidemux.c
index 19d5e7a8..f996ee37 100644
--- a/gst/avi/gstavidemux.c
+++ b/gst/avi/gstavidemux.c
@@ -387,7 +387,7 @@ gst_avi_demux_handle_src_query (GstPad * pad, GstQuery * query)
switch (GST_QUERY_TYPE (query)) {
case GST_QUERY_POSITION:{
- gint64 len, pos;
+ gint64 len, pos = 0;
len = (((gfloat) stream->strh->scale) * stream->strh->length /
stream->strh->rate) * GST_SECOND;
@@ -418,7 +418,8 @@ gst_avi_demux_handle_src_query (GstPad * pad, GstQuery * query)
pos = stream->current_frame * demux->avih->us_frame * GST_USECOND;
}
}
- gst_query_set_position (query, GST_FORMAT_TIME, pos, len);
+ if (res)
+ gst_query_set_position (query, GST_FORMAT_TIME, pos, len);
break;
}
default: