From: <tve...@ke...> - 2007-12-29 20:55:49
|
CVS Root: /cvs/gstreamer Module: gst-plugins-base Changes by: tvermeir Date: Sat Dec 29 2007 20:55:53 UTC Log message: * gst/subparse/gstssaparse.c: combine if's Modified files: . : ChangeLog gst/subparse : gstssaparse.c Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-base/ChangeLog.diff?r1=1.3663&r2=1.3664 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-base/gst/subparse/gstssaparse.c.diff?r1=1.6&r2=1.7 ====Begin Diffs==== Index: ChangeLog =================================================================== RCS file: /cvs/gstreamer/gst-plugins-base/ChangeLog,v retrieving revision 1.3663 retrieving revision 1.3664 diff -u -d -r1.3663 -r1.3664 --- ChangeLog 29 Dec 2007 19:23:58 -0000 1.3663 +++ ChangeLog 29 Dec 2007 20:55:38 -0000 1.3664 @@ -1,6 +1,11 @@ 2007-12-29 Thijs Vermeir <thi...@gm...> * gst/subparse/gstssaparse.c: + combine if's + +2007-12-29 Thijs Vermeir <thi...@gm...> + * gst/subparse/gstssaparse.c: remove duplicate log message 2007-12-29 Sebastian Dröge <sl...@ci...> Index: gstssaparse.c RCS file: /cvs/gstreamer/gst-plugins-base/gst/subparse/gstssaparse.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- gstssaparse.c 29 Dec 2007 19:23:59 -0000 1.6 +++ gstssaparse.c 29 Dec 2007 20:55:39 -0000 1.7 @@ -313,13 +313,11 @@ ts = GST_BUFFER_TIMESTAMP (buf); ret = gst_ssa_parse_push_line (parse, txt, ts, GST_BUFFER_DURATION (buf)); - if (ret != GST_FLOW_OK) { - if (GST_CLOCK_TIME_IS_VALID (ts)) { - /* just advance time without sending anything */ - gst_pad_push_event (parse->srcpad, - gst_event_new_new_segment (TRUE, 1.0, GST_FORMAT_TIME, ts, -1, ts)); - ret = GST_FLOW_OK; - } + if (ret != GST_FLOW_OK && GST_CLOCK_TIME_IS_VALID (ts)) { + /* just advance time without sending anything */ + gst_pad_push_event (parse->srcpad, + gst_event_new_new_segment (TRUE, 1.0, GST_FORMAT_TIME, ts, -1, ts)); + ret = GST_FLOW_OK; } g_free (txt); |