gst/avi/gstavidemux.*: Some cleanups, prepare to use GstSegment.

Original commit message from CVS:
* gst/avi/gstavidemux.c: (gst_avi_demux_reset),
(gst_avi_demux_index_next), (gst_avi_demux_handle_src_query),
(gst_avi_demux_handle_src_event), (gst_avi_demux_parse_subindex),
(gst_avi_demux_parse_stream), (gst_avi_demux_parse_index),
(gst_avi_demux_stream_index), (gst_avi_demux_stream_scan),
(gst_avi_demux_massage_index),
(gst_avi_demux_calculate_durations_from_index),
(gst_avi_demux_push_event), (gst_avi_demux_stream_header),
(gst_avi_demux_handle_seek), (gst_avi_demux_process_next_entry),
(gst_avi_demux_loop):
* gst/avi/gstavidemux.h:
Some cleanups, prepare to use GstSegment.
Fix error in entry walking code.
Fix VBR detection.
Smarter timestamp calculation code.
Uniform error/eos handling.

1 files changed, 7 insertions, 6 deletions

diff --git a/gst/avi/gstavidemux.h b/gst/avi/gstavidemux.h
index 6c083613..a327fa9a 100644
--- a/gst/avi/gstavidemux.h
+++ b/gst/avi/gstavidemux.h
@@ -81,6 +81,10 @@ typedef struct {
   /* stream length */
   guint64        total_bytes;
   guint32        total_frames;
+  guint64        total_time;
+
+  /* VBR indicator */
+  gboolean       is_vbr;
 
   /* stream length according to index */
   GstClockTime   idx_duration;
@@ -119,13 +123,10 @@ typedef struct _GstAviDemux {
   /* some stream info for length */
   gst_riff_avih *avih;
 
-  /* seeking */
-  gdouble       segment_rate;
-  GstSeekFlags  segment_flags;
-  /* in GST_FORMAT_TIME */
-  gint64        segment_start;
-  gint64        segment_stop;
+  /* seeking in TIME */
+  GstSegment    segment;
   GstEvent      *seek_event;
+
 } GstAviDemux;
 
 typedef struct _GstAviDemuxClass {