From: <rb...@fr...> - 2005-07-01 17:22:57
|
CVS Root: /cvs/gstreamer Module: gst-plugins Changes by: rbultje Date: Fri Jul 01 2005 10:22:55 PDT Branch: BRANCH-GSTREAMER-0_8 Log message: Reviewed by: Ronald S. Bultje <rb...@ro...> * gst/matroska/matroska-mux.c: (gst_matroska_mux_prepare_data): Do not check for number, since it can be called before negotiation took place and thus not be set, which makes the muxer fail on startup (#308633). Modified files: . : ChangeLog gst/matroska : matroska-mux.c Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/ChangeLog.diff?r1=1.1641.2.269&r2=1.1641.2.270 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/gst/matroska/matroska-mux.c.diff?r1=1.18.2.2&r2=1.18.2.3 ====Begin Diffs==== Index: matroska-mux.c =================================================================== RCS file: /cvs/gstreamer/gst-plugins/gst/matroska/matroska-mux.c,v retrieving revision 1.18.2.2 retrieving revision 1.18.2.3 diff -u -d -r1.18.2.2 -r1.18.2.3 --- matroska-mux.c 9 Jun 2005 17:08:57 -0000 1.18.2.2 +++ matroska-mux.c 1 Jul 2005 17:22:43 -0000 1.18.2.3 @@ -974,7 +974,6 @@ for (i = 0; i < mux->num_streams; i++) { while (!mux->sink[i].eos && !mux->sink[i].buffer && - mux->sink[i].track->num > 0 && GST_PAD_IS_USABLE (mux->sink[i].track->pad)) { GstData *data; Index: ChangeLog RCS file: /cvs/gstreamer/gst-plugins/ChangeLog,v retrieving revision 1.1641.2.269 retrieving revision 1.1641.2.270 diff -u -d -r1.1641.2.269 -r1.1641.2.270 --- ChangeLog 1 Jul 2005 16:52:31 -0000 1.1641.2.269 +++ ChangeLog 1 Jul 2005 17:22:43 -0000 1.1641.2.270 @@ -1,3 +1,12 @@ +2005-07-01 Michal Benes <mic...@xe...> + + Reviewed by: Ronald S. Bultje <rb...@ro...> + * gst/matroska/matroska-mux.c: (gst_matroska_mux_prepare_data): + Do not check for number, since it can be called before negotiation + took place and thus not be set, which makes the muxer fail on + startup (#308633). 2005-07-01 Ronald S. Bultje <rb...@ro...> * configure.ac: |