From b3739a8e7d2ec0ac87d3d8ec5214a1e981d3601c Mon Sep 17 00:00:00 2001 From: Thijs Vermeir Date: Sat, 29 Dec 2007 20:55:39 +0000 Subject: [PATCH] gst/subparse/gstssaparse.c: combine if's Original commit message from CVS: * gst/subparse/gstssaparse.c: combine if's --- ChangeLog | 5 +++++ gst/subparse/gstssaparse.c | 12 +++++------- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5c0c2f1..8a8ea5e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,11 @@ 2007-12-29 Thijs Vermeir * gst/subparse/gstssaparse.c: + combine if's + +2007-12-29 Thijs Vermeir + + * gst/subparse/gstssaparse.c: remove duplicate log message 2007-12-29 Sebastian Dröge diff --git a/gst/subparse/gstssaparse.c b/gst/subparse/gstssaparse.c index b7de847..d720d1a 100644 --- a/gst/subparse/gstssaparse.c +++ b/gst/subparse/gstssaparse.c @@ -313,13 +313,11 @@ gst_ssa_parse_chain (GstPad * sinkpad, GstBuffer * buf) 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); -- 2.7.4