From 3ffe64515ed18e1ee53aa78d83632a92c0114c13 Mon Sep 17 00:00:00 2001
From: Edward Hervey <bilboed@bilboed.com>
Date: Mon, 19 Dec 2005 15:43:30 +0000
Subject: [PATCH] gst/avi/gstavidemux.c: Stupid signedness issue...

Original commit message from CVS:
* gst/avi/gstavidemux.c: (gst_avi_demux_stream_scan):
Stupid signedness issue...
---
 ChangeLog             |  5 +++++
 gst/avi/gstavidemux.c | 17 ++++++++++++-----
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index dc171c442f..89215afd7b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-12-19  Edward Hervey  <edward@fluendo.com>
+
+	* gst/avi/gstavidemux.c: (gst_avi_demux_stream_scan):
+	Stupid signedness issue...
+
 2005-12-19  Edward Hervey  <edward@fluendo.com>
 
 	* gst/avi/gstavidemux.c: (gst_avi_demux_reset),
diff --git a/gst/avi/gstavidemux.c b/gst/avi/gstavidemux.c
index b7d0521da5..7232fd1777 100644
--- a/gst/avi/gstavidemux.c
+++ b/gst/avi/gstavidemux.c
@@ -1571,6 +1571,7 @@ gst_avi_demux_stream_scan (GstAviDemux * avi,
   GstFormat format = GST_FORMAT_BYTES;
   guint64 pos = avi->offset;
   guint64 length;
+  gint64 tmplength;
   guint32 tag;
   GstPad *peer;
   GList *list = NULL;
@@ -1585,8 +1586,9 @@ gst_avi_demux_stream_scan (GstAviDemux * avi,
 
   if (!(peer = gst_pad_get_peer (avi->sinkpad)))
     return FALSE;
-  if (!(gst_pad_query_duration (peer, &format, &length)))
+  if (!(gst_pad_query_duration (peer, &format, &tmplength)))
     return FALSE;
+  length = tmplength;
   gst_object_unref (peer);
 
   if (*index) {
@@ -1608,6 +1610,7 @@ gst_avi_demux_stream_scan (GstAviDemux * avi,
   while (1) {
     gint stream_nr;
     guint size;
+    gint64 tmpts, tmpdur;
 
     if ((res =
             gst_avi_demux_next_data_buffer (avi, &pos, &tag,
@@ -1636,16 +1639,20 @@ gst_avi_demux_stream_scan (GstAviDemux * avi,
       format = GST_FORMAT_TIME;
       /* constant rate stream */
       gst_avi_demux_src_convert (stream->pad, GST_FORMAT_BYTES,
-          stream->total_bytes, &format, &entry->ts);
+          stream->total_bytes, &format, &tmpts);
+      entry->ts = tmpts;
       gst_avi_demux_src_convert (stream->pad, GST_FORMAT_BYTES,
-          stream->total_bytes + entry->size, &format, &entry->dur);
+          stream->total_bytes + entry->size, &format, &tmpdur);
+      entry->dur = tmpdur;
     } else {
       format = GST_FORMAT_TIME;
       /* VBR stream */
       gst_avi_demux_src_convert (stream->pad, GST_FORMAT_DEFAULT,
-          stream->total_frames, &format, &entry->ts);
+          stream->total_frames, &format, &tmpts);
+      entry->ts = tmpts;
       gst_avi_demux_src_convert (stream->pad, GST_FORMAT_DEFAULT,
-          stream->total_frames + 1, &format, &entry->dur);
+          stream->total_frames + 1, &format, &tmpdur);
+      entry->dur = tmpdur;
     }
     entry->dur -= entry->ts;