summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
m---------common0
-rw-r--r--gst/avi/gstavidemux.c2
3 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 929c52ab..b07bd193 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2006-02-02 Tim-Philipp Müller <tim at centricular dot net>
+ * gst/avi/gstavidemux.c: (gst_avi_demux_all_source_pads_unlinked):
+ Only pause if all pads are unlinked AND we've tried to send data
+ on all of them at least once.
+
+2006-02-02 Tim-Philipp Müller <tim at centricular dot net>
+
* gst/avi/gstavidemux.c: (gst_avi_demux_all_source_pads_unlinked),
(gst_avi_demux_process_next_entry), (gst_avi_demux_loop):
Make loop function/task pause itself when all source pads are
diff --git a/common b/common
-Subproject 1140eabed84dd1d8d6df7df88f5c8bdf20a8faa
+Subproject 79d67fe009b6120b82d51df860c78e8361f02ae
diff --git a/gst/avi/gstavidemux.c b/gst/avi/gstavidemux.c
index c3874c2a..74709a59 100644
--- a/gst/avi/gstavidemux.c
+++ b/gst/avi/gstavidemux.c
@@ -2251,7 +2251,7 @@ gst_avi_demux_all_source_pads_unlinked (GstAviDemux * avi)
peer = gst_pad_get_peer (avi->stream[i].pad);
if (peer) {
gst_object_unref (peer);
- } else {
+ } else if (avi->stream[i].current_frame > 0) {
++num_unlinked;
}
}