From: Tim-Philipp Müller Date: Thu, 2 Feb 2006 21:00:16 +0000 (+0000) Subject: gst/avi/gstavidemux.c: Only pause if all pads are unlinked AND we've tried to send... X-Git-Tag: 1.19.3~509^2~13081 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9a64d2bb3a02c34022849921e0dcd097e2eec8a4;p=platform%2Fupstream%2Fgstreamer.git 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. --- diff --git a/ChangeLog b/ChangeLog index 929c52a..b07bd19 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2006-02-02 Tim-Philipp Müller + * 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 + * 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 index 1140eab..79d67fe 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit 1140eabed84dd1d8d6df7df88f5c8bdf20a8faa1 +Subproject commit 79d67fe009b6120b82d51df860c78e8361f02aea diff --git a/gst/avi/gstavidemux.c b/gst/avi/gstavidemux.c index c3874c2..74709a5 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; } }