From 663856a5144843cd0dcd524b4529be00d005c8c0 Mon Sep 17 00:00:00 2001 From: Edward Hervey Date: Mon, 3 Jul 2006 15:28:48 +0000 Subject: gst/avi/gstavidemux.*: Proper aggregation of each stream's GstFlowReturn in order to figure out whether the task shou... Original commit message from CVS: * gst/avi/gstavidemux.c: (gst_avi_demux_reset), (gst_avi_demux_read_subindexes), (gst_avi_demux_parse_stream), (gst_avi_demux_handle_seek), (gst_avi_demux_aggregated_flow), (gst_avi_demux_process_next_entry), (push_tag_lists), (gst_avi_demux_stream_data), (gst_avi_demux_loop): * gst/avi/gstavidemux.h: Proper aggregation of each stream's GstFlowReturn in order to figure out whether the task should stop or not. Don't send inline events before pushing out a NEW_SEGMENT, more specifically for GST_TAG_EVENT. Change a GST_ERROR to a GST_WARNING for a non-fatal situation in reading sub-indexes. --- gst/avi/gstavidemux.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'gst/avi/gstavidemux.h') diff --git a/gst/avi/gstavidemux.h b/gst/avi/gstavidemux.h index 0cb26def..0ea5123f 100644 --- a/gst/avi/gstavidemux.h +++ b/gst/avi/gstavidemux.h @@ -90,6 +90,8 @@ typedef struct { GstClockTime idx_duration; guint64 *indexes; + + GstTagList *taglist; } avi_stream_context; typedef enum { @@ -127,6 +129,8 @@ typedef struct _GstAviDemux { GstSegment segment; GstEvent *seek_event; + gboolean got_tags; + } GstAviDemux; typedef struct _GstAviDemuxClass { -- cgit