From: <tp...@fr...> - 2006-02-02 21:03:13
|
CVS Root: /cvs/gstreamer Module: gst-plugins-good Changes by: tpm Date: Thu Feb 02 2006 13:00:28 PST Log message: * 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. Modified files: . : ChangeLog gst/avi : gstavidemux.c Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/ChangeLog.diff?r1=1.2113&r2=1.2114 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/gst/avi/gstavidemux.c.diff?r1=1.161&r2=1.162 ====Begin Diffs==== Index: ChangeLog =================================================================== RCS file: /cvs/gstreamer/gst-plugins-good/ChangeLog,v retrieving revision 1.2113 retrieving revision 1.2114 diff -u -d -r1.2113 -r1.2114 --- ChangeLog 2 Feb 2006 12:29:24 -0000 1.2113 +++ ChangeLog 2 Feb 2006 21:00:15 -0000 1.2114 @@ -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 Index: gstavidemux.c RCS file: /cvs/gstreamer/gst-plugins-good/gst/avi/gstavidemux.c,v retrieving revision 1.161 retrieving revision 1.162 diff -u -d -r1.161 -r1.162 --- gstavidemux.c 2 Feb 2006 12:29:24 -0000 1.161 +++ gstavidemux.c 2 Feb 2006 21:00:16 -0000 1.162 @@ -2251,7 +2251,7 @@ 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; } } |