From 926b61f1601ef6b8b0229aeca63859b790be7751 Mon Sep 17 00:00:00 2001 From: "Ronald S. Bultje" Date: Thu, 30 Jun 2005 10:28:25 +0000 Subject: g/: Revert earlier commit defaulting to autovideosink because the sync-state bug is still there, breaking Totem. Original commit message from CVS: * gconf/gstreamer.schemas.in: * gst-libs/gst/gconf/gconf.c: (gst_gconf_get_default_video_sink): Revert earlier commit defaulting to autovideosink because the sync-state bug is still there, breaking Totem. --- ChangeLog | 7 +++++++ gconf/gstreamer.schemas.in | 2 +- gst-libs/gst/gconf/gconf.c | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5c9d6ad0..7cdbe607 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2005-06-30 Ronald S. Bultje + + * gconf/gstreamer.schemas.in: + * gst-libs/gst/gconf/gconf.c: (gst_gconf_get_default_video_sink): + Revert earlier commit defaulting to autovideosink because the + sync-state bug is still there, breaking Totem. + 2005-06-30 Thomas Klausner Reviewed by: Ronald S. Bultje diff --git a/gconf/gstreamer.schemas.in b/gconf/gstreamer.schemas.in index cc6cd4c7..e3d893c1 100644 --- a/gconf/gstreamer.schemas.in +++ b/gconf/gstreamer.schemas.in @@ -16,7 +16,7 @@ /system/gstreamer/@GST_MAJORMINOR@/default/videosink gstreamer string - autovideosink + @DEFAULT_VIDEOSINK@ default GStreamer videosink GStreamer can play video using any number of output elements. Some possible choices are xvimagesink, ximagesink, sdlvideosink and aasink. The videosink can be a partial pipeline instead of just one element. diff --git a/gst-libs/gst/gconf/gconf.c b/gst-libs/gst/gconf/gconf.c index e18a2192..4c7509e2 100644 --- a/gst-libs/gst/gconf/gconf.c +++ b/gst-libs/gst/gconf/gconf.c @@ -229,7 +229,7 @@ gst_gconf_get_default_video_sink (void) GstElement *ret = gst_gconf_render_bin_from_key ("default/videosink"); if (!ret) { - ret = gst_element_factory_make ("autovideosink", NULL); + ret = gst_element_factory_make ("xvimagesink", NULL); if (!ret) g_warning ("No GConf default video sink key and %s doesn't work", -- cgit v1.2.1