summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Vander Stichele <thomas@apestaart.org>2002-04-15 09:27:03 +0000
committerThomas Vander Stichele <thomas@apestaart.org>2002-04-15 09:27:03 +0000
commit4a596daeb3710e5560a801aaaeb872d231133098 (patch)
treecee6e4784c61e9f9387eadc2ef1e8a9aff485761
parent79fa56ed76ae91ff01edbc20b5cc7ceb50d2bf7c (diff)
more mergeback from the latest release
Original commit message from CVS: more mergeback from the latest release
-rw-r--r--README8
-rw-r--r--REQUIREMENTS7
-rw-r--r--configure.ac7
-rw-r--r--sys/oss/gstosssink.c4
-rwxr-xr-xtools/gst-launch-ext6
5 files changed, 25 insertions, 7 deletions
diff --git a/README b/README
index bad30730..d59daa49 100644
--- a/README
+++ b/README
@@ -4,8 +4,16 @@ plugins for GStreamer
* to develop against uninstalled GStreamer core :
add path to gstreamer-uninstalled.pc to PKG_CONFIG_PATH
+ or run configure --with-pkg-config-path=(path to gstreamer uninstalled)
* to register plugins in source tree
run gst-register --gst-plugin-path=.
+* if a certain plugin doesn't build, then redo configure with
+ --disable-(plugin)
+ to disable it from the build
+* Additional documentation :
+
+REQUIREMENTS
+ supporting libraries for plugins
diff --git a/REQUIREMENTS b/REQUIREMENTS
new file mode 100644
index 00000000..6cc1e9fb
--- /dev/null
+++ b/REQUIREMENTS
@@ -0,0 +1,7 @@
+This file lists supporting libraries for which gst-plugins contains plugins,
+as well as their minimum version. You can find the corresponding plugins in
+ext/(library)
+
+a52dec 0.7.3
+avifile >= 0.6.0 (cvs)
+
diff --git a/configure.ac b/configure.ac
index 1ac08518..3ebe17d3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10,10 +10,15 @@ AM_DISABLE_STATIC
dnl when going to/from release please set the nano (fourth number) right !
dnl We disable static building for development, for time savings
AM_DISABLE_STATIC
-AS_VERSION(gst-plugins, GST_PLUGINS, 0, 3, 3, 1)
+AS_VERSION(gst-plugins, GST_PLUGINS, 0, 3, 4, 0)
AM_INIT_AUTOMAKE($PACKAGE,$VERSION)
AS_LIBTOOL(GST_PLUGINS, 0, 0, 0, yes)
+dnl we'll move this to a configure option later on which will be turned on
+dnl by autogen
+dnl GST_ERROR="-Wall -Werror"
+GST_ERROR="-Werror"
+
dnl FIXME take something else ?
AC_CONFIG_SRCDIR([gst/law/alaw.c])
AM_CONFIG_HEADER(config.h)
diff --git a/sys/oss/gstosssink.c b/sys/oss/gstosssink.c
index 59e1950c..c5d96cb1 100644
--- a/sys/oss/gstosssink.c
+++ b/sys/oss/gstosssink.c
@@ -474,9 +474,7 @@ gst_osssink_chain (GstPad *pad, GstBuffer *buf)
}
- /* FIXME: reverted wtay's patch.
- The way that's commented out isn't working on BE machines.
- I guess it should be sample accurate and not capped inbetween.
+ /* this doesn't work on BE machines, apparently
while (size) {
gint tosend = MIN (size, frag);
write (osssink->fd, data, tosend);
diff --git a/tools/gst-launch-ext b/tools/gst-launch-ext
index 27a1306a..61cd2ca2 100755
--- a/tools/gst-launch-ext
+++ b/tools/gst-launch-ext
@@ -81,14 +81,14 @@ read_config ();
### "ac3", "ac3parse ! $cfg{AUDIOSINK}",
%pipes = (
"au", "auparse ! $cfg{AUDIOSINK}",
- "avi", "avidemux video_00! { queue ! windec ! $cfg{VIDEOSINK} } avidemux0.audio_00! { queue ! mad ! $cfg{AUDIOSINK} }",
+ "avi", "avidemux video_%02d! { queue ! windec ! $cfg{VIDEOSINK} } avidemux0.audio_00! { queue ! mad ! $cfg{AUDIOSINK} }",
"fli", "flxdec ! colorspace ! $cfg{VIDEOSINK}",
"mod", "modplug ! $cfg{AUDIOSINK}",
"mp3", "mad ! $cfg{AUDIOSINK}",
- "mpg", "mpegdemux video_00! { queue ! mpeg2dec ! $cfg{VIDEOSINK} } mpegdemux0.audio_00! { queue ! mad ! $cfg{AUDIOSINK} }",
+ "mpg", "mpegdemux video_%02d! { queue ! mpeg2dec ! $cfg{VIDEOSINK} } mpegdemux0.audio_%02d! { queue ! mad ! $cfg{AUDIOSINK} }",
"ogg", "vorbisdec ! $cfg{AUDIOSINK}",
"sid", "siddec ! $cfg{AUDIOSINK}",
- "vob", "mpegdemux video_00! { queue max_level=500 ! mpeg2dec ! $cfg{VIDEOSINK} } mpegdemux0.private_stream_1.0! { queue max_level=500 ! a52dec ! $cfg{AUDIOSINK} }",
+ "vob", "mpegdemux video_%02d! { queue max_level=500 ! mpeg2dec ! $cfg{VIDEOSINK} } mpegdemux0.private_stream_1_%02d! { queue max_level=500 ! a52dec ! $cfg{AUDIOSINK} }",
);
if ($cfg{VISUALIZER}) {