From 58896333c70700d2e0428c9908f26064b7abe77d Mon Sep 17 00:00:00 2001
From: Thomas Vander Stichele <thomas@apestaart.org>
Date: Mon, 15 Apr 2002 09:27:02 +0000
Subject: [PATCH] more mergeback from the latest release

Original commit message from CVS:
more mergeback from the latest release
---
 README                        | 8 ++++++++
 REQUIREMENTS                  | 7 +++++++
 configure.ac                  | 7 ++++++-
 gst/mpegstream/gstmpegdemux.c | 2 +-
 4 files changed, 22 insertions(+), 2 deletions(-)
 create mode 100644 REQUIREMENTS

diff --git a/README b/README
index bad3073..d59daa4 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 0000000..6cc1e9f
--- /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 1ac0851..3ebe17d 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/gst/mpegstream/gstmpegdemux.c b/gst/mpegstream/gstmpegdemux.c
index 5488ff4..1de2ab4 100644
--- a/gst/mpegstream/gstmpegdemux.c
+++ b/gst/mpegstream/gstmpegdemux.c
@@ -94,7 +94,7 @@ GST_PAD_TEMPLATE_FACTORY (video_mpeg2_factory,
 
 
 GST_PAD_TEMPLATE_FACTORY (private1_factory,
-  "private_stream_1_%d",
+  "private_stream_1_%02d",
   GST_PAD_SRC,
   GST_PAD_SOMETIMES,
   GST_CAPS_NEW (
-- 
2.7.4