From 94828d9ac60b8f8f6bca1f7e929b4bba0da5c1fd Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Tue, 3 Jul 2007 17:01:51 +0000 Subject: [PATCH] tools/gst-launch.c: When we got an error, there is no point in waiting for preroll when shutting down. Original commit message from CVS: * tools/gst-launch.c: (main): When we got an error, there is no point in waiting for preroll when shutting down. --- ChangeLog | 6 ++++++ tools/gst-launch.c | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index a03eccc4e5..bf48d517ff 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-07-03 Wim Taymans + + * tools/gst-launch.c: (main): + When we got an error, there is no point in waiting for preroll when + shutting down. + 2007-07-03 Wim Taymans * plugins/elements/gsttee.c: (gst_tee_base_init), diff --git a/tools/gst-launch.c b/tools/gst-launch.c index 616e5b8948..6b7b0d1e13 100644 --- a/tools/gst-launch.c +++ b/tools/gst-launch.c @@ -745,7 +745,8 @@ main (int argc, char *argv[]) fprintf (stderr, _("Setting pipeline to PAUSED ...\n")); gst_element_set_state (pipeline, GST_STATE_PAUSED); - gst_element_get_state (pipeline, &state, &pending, GST_CLOCK_TIME_NONE); + if (!caught_error) + gst_element_get_state (pipeline, &state, &pending, GST_CLOCK_TIME_NONE); fprintf (stderr, _("Setting pipeline to READY ...\n")); gst_element_set_state (pipeline, GST_STATE_READY); gst_element_get_state (pipeline, &state, &pending, GST_CLOCK_TIME_NONE);