diff options
| author | Ronald S. Bultje <rbultje@ronald.bitfreak.net> | 2005-06-30 10:28:25 +0000 |
|---|---|---|
| committer | Ronald S. Bultje <rbultje@ronald.bitfreak.net> | 2005-06-30 10:28:25 +0000 |
| commit | 926b61f1601ef6b8b0229aeca63859b790be7751 (patch) | |
| tree | a960c8b7099d398667d15d53094798cda2fe8682 | |
| parent | bfe6506e9052b2180bdc89dac2579c2852ffaf84 (diff) | |
| download | gst-plugins-bad-926b61f1601ef6b8b0229aeca63859b790be7751.tar.gz gst-plugins-bad-926b61f1601ef6b8b0229aeca63859b790be7751.tar.bz2 gst-plugins-bad-926b61f1601ef6b8b0229aeca63859b790be7751.zip | |
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.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | gconf/gstreamer.schemas.in | 2 | ||||
| -rw-r--r-- | gst-libs/gst/gconf/gconf.c | 2 |
3 files changed, 9 insertions, 2 deletions
@@ -1,3 +1,10 @@ +2005-06-30 Ronald S. Bultje <rbultje@ronald.bitfreak.net> + + * 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 <tk@giga.or.at> Reviewed by: Ronald S. Bultje <rbultje@ronald.bitfreak.net> 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 @@ <applyto>/system/gstreamer/@GST_MAJORMINOR@/default/videosink</applyto> <owner>gstreamer</owner> <type>string</type> - <default>autovideosink</default> + <default>@DEFAULT_VIDEOSINK@</default> <locale name="C"> <short>default GStreamer videosink</short> <long>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.</long> 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", |