diff options
author | Tim-Philipp Müller <tim@centricular.net> | 2006-02-02 21:00:16 +0000 |
---|---|---|
committer | Tim-Philipp Müller <tim@centricular.net> | 2006-02-02 21:00:16 +0000 |
commit | 9a64d2bb3a02c34022849921e0dcd097e2eec8a4 (patch) | |
tree | 737a101fa0bd2279df17048888bed5d4c77781ba | |
parent | 00ed57af01c4314c628b53bffa8635280e6d1408 (diff) |
gst/avi/gstavidemux.c: Only pause if all pads are unlinked AND we've tried to send data on all of them at least once.
Original commit message from CVS:
* 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.
-rw-r--r-- | ChangeLog | 6 | ||||
m--------- | common | 0 | ||||
-rw-r--r-- | gst/avi/gstavidemux.c | 2 |
3 files changed, 7 insertions, 1 deletions
@@ -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; } } |