diff options
| author | Julien Moutte <julien@moutte.net> | 2003-12-21 22:11:46 +0000 |
|---|---|---|
| committer | Julien Moutte <julien@moutte.net> | 2003-12-21 22:11:46 +0000 |
| commit | 1835d5eb9c76f5c8eab4fe6ac8fca3bd0f846564 (patch) | |
| tree | c003f79c828cbba2045ba43d3382dd9077c88aaf /gst-libs | |
| parent | ca200c8a757d4d4e59425f0ff8add0770e1427e4 (diff) | |
| download | gst-plugins-bad-1835d5eb9c76f5c8eab4fe6ac8fca3bd0f846564.tar.gz gst-plugins-bad-1835d5eb9c76f5c8eab4fe6ac8fca3bd0f846564.tar.bz2 gst-plugins-bad-1835d5eb9c76f5c8eab4fe6ac8fca3bd0f846564.zip | |
examples/gstplay/player.c: using g_print instead of g_message.
Original commit message from CVS:
* examples/gstplay/player.c: (got_time_tick), (got_stream_length),
(got_video_size), (main): using g_print instead of g_message.
* gst-libs/gst/play/gstplay.c: (gst_play_pipeline_setup): Fixing EOS
signal which was not emitted because of "switch" element added to the
bin but not connected. (Removing from the bin temporarily)
Diffstat (limited to 'gst-libs')
| -rw-r--r-- | gst-libs/gst/play/gstplay.c | 13 | ||||
| -rw-r--r-- | gst-libs/gst/play/play.c | 13 |
2 files changed, 16 insertions, 10 deletions
diff --git a/gst-libs/gst/play/gstplay.c b/gst-libs/gst/play/gstplay.c index eb4d161c..8e0c9754 100644 --- a/gst-libs/gst/play/gstplay.c +++ b/gst-libs/gst/play/gstplay.c @@ -108,11 +108,14 @@ gst_play_pipeline_setup (GstPlay *play) g_hash_table_insert (play->priv->elements, "video_queue", video_queue); /* Colorspace conversion */ - /* FIXME: Use ffcolorspace and fallback to Hermes on failure ?*/ - video_colorspace = gst_element_factory_make ("colorspace", + video_colorspace = gst_element_factory_make ("ffcolorspace", "video_colorspace"); - if (!GST_IS_ELEMENT (video_colorspace)) - return FALSE; + if (!GST_IS_ELEMENT (video_colorspace)) { + video_colorspace = gst_element_factory_make ("colorspace", + "video_colorspace"); + if (!GST_IS_ELEMENT (video_colorspace)) + return FALSE; + } g_hash_table_insert (play->priv->elements, "video_colorspace", video_colorspace); @@ -147,7 +150,7 @@ gst_play_pipeline_setup (GstPlay *play) g_hash_table_insert (play->priv->elements, "video_switch", video_switch); - gst_bin_add (GST_BIN (work_thread), video_switch); + /*gst_bin_add (GST_BIN (work_thread), video_switch);*/ /* Connecting autoplugger to video switch and video switch to video output gst_element_link (autoplugger, video_switch); diff --git a/gst-libs/gst/play/play.c b/gst-libs/gst/play/play.c index eb4d161c..8e0c9754 100644 --- a/gst-libs/gst/play/play.c +++ b/gst-libs/gst/play/play.c @@ -108,11 +108,14 @@ gst_play_pipeline_setup (GstPlay *play) g_hash_table_insert (play->priv->elements, "video_queue", video_queue); /* Colorspace conversion */ - /* FIXME: Use ffcolorspace and fallback to Hermes on failure ?*/ - video_colorspace = gst_element_factory_make ("colorspace", + video_colorspace = gst_element_factory_make ("ffcolorspace", "video_colorspace"); - if (!GST_IS_ELEMENT (video_colorspace)) - return FALSE; + if (!GST_IS_ELEMENT (video_colorspace)) { + video_colorspace = gst_element_factory_make ("colorspace", + "video_colorspace"); + if (!GST_IS_ELEMENT (video_colorspace)) + return FALSE; + } g_hash_table_insert (play->priv->elements, "video_colorspace", video_colorspace); @@ -147,7 +150,7 @@ gst_play_pipeline_setup (GstPlay *play) g_hash_table_insert (play->priv->elements, "video_switch", video_switch); - gst_bin_add (GST_BIN (work_thread), video_switch); + /*gst_bin_add (GST_BIN (work_thread), video_switch);*/ /* Connecting autoplugger to video switch and video switch to video output gst_element_link (autoplugger, video_switch); |