summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Vander Stichele <thomas@apestaart.org>2004-07-08 07:44:01 +0000
committerThomas Vander Stichele <thomas@apestaart.org>2004-07-08 07:44:01 +0000
commitbb7ac88d1b09e3f586d31209604755783e839108 (patch)
treee23b1b8f6acbd9fe2f959cb23dcfd665e2c682dc
parent4682970b26e65371b3ac53b4ec573b627d68e2df (diff)
update
Original commit message from CVS: update
-rw-r--r--ChangeLog6
-rw-r--r--tools/gst-launch-ext-m.m2
-rw-r--r--tools/gst-launch-ext.1.in9
3 files changed, 12 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 7abb9c33..9e23448e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-07-08 Thomas Vander Stichele <thomas (at) apestaart (dot) org>
+
+ * tools/gst-launch-ext-m.m:
+ * tools/gst-launch-ext.1.in:
+ convert to the third millenium
+
2004-07-07 David Schleef <ds@schleef.org>
* sys/dxr3/Makefile.am: noinst_SOURCES should be nodist_SOURCES
diff --git a/tools/gst-launch-ext-m.m b/tools/gst-launch-ext-m.m
index dc794dd0..d7908df9 100644
--- a/tools/gst-launch-ext-m.m
+++ b/tools/gst-launch-ext-m.m
@@ -56,7 +56,7 @@ sub read_config
print "This is not an error, just a friendly reminder... Check the man page.\n\n";
}
if (!defined $cfg{AUDIOSINK}) { $cfg{AUDIOSINK} = "osssink"; }
- if (!defined $cfg{VIDEOSINK}) { $cfg{VIDEOSINK} = "ffcolorspace ! xvimagesink"; }
+ if (!defined $cfg{VIDEOSINK}) { $cfg{VIDEOSINK} = "ffmpegcolorspace ! xvimagesink"; }
if (!defined $cfg{CVS_PATH}) { $cfg{CVS_PATH} = `echo -n ~`."/gst/cvs"; }
if ($command =~ /(.+)\/gst-launch-ext-@GST_MAJORMINOR@$/)
diff --git a/tools/gst-launch-ext.1.in b/tools/gst-launch-ext.1.in
index 1c2f7cee..fd2ebf1b 100644
--- a/tools/gst-launch-ext.1.in
+++ b/tools/gst-launch-ext.1.in
@@ -26,11 +26,12 @@ the defaults for audio and video output sinks.
Here is an example .gst file that implements the same defaults as hard-coded
in the script :
-AUDIOSINK = "osssink";
-VIDEOSINK = "colorspace ! xvideosink";
+AUDIOSINK = osssink
+VIDEOSINK = ffmpegcolorspace ! xvimagesink
-You can change osssink to any of esdsink, alsasink, jacksink (if you have
-the plug-in), and you can change xvideosink to aasink or sdlvideosink.
+You can change osssink to esdsink or alsasink (if you have
+the plug-in), and you can change xvimagesink to ximagesink, aasink
+or sdlvideosink.
Other plug-ins might be used as well if GStreamer has them.