merge from release branch

Original commit message from CVS:
merge from release branch
parent 3e4f2fac
......@@ -10,14 +10,14 @@ else
EXT_DIR=
endif
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = gstreamer-libs.pc
SUBDIRS=gst-libs gst sys $(EXT_DIR) examples tools $(GCONF_DIR) ## testsuite
DIST_SUBDIRS=gst-libs gst sys ext examples tools gconf ## testsuite
EXTRA_DIST=gst-plugins.spec depcomp \
AUTHORS COPYING README RELEASE LICENSE LICENSE_readme \
ChangeLog autogen.sh common m4
dist-hook:
rm -rf `find $(distdir)/common -name CVS`
rm -rf `find $(distdir)/m4 -name CVS`
gstreamer-libs.pc.in gstreamer-libs-uninstalled.pc.in \
AUTHORS COPYING README RELEASE \
ChangeLog autogen.sh
gst-plugins
plugins for GStreamer
gst-plugins : plug-ins 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
* to register plug-ins in source tree
run gst-register --gst-plugin-path=.
* if a certain plugin doesn't build, then redo configure with
--disable-(plugin)
* if a certain plug-in doesn't build, then redo configure with
--disable-(plug-in)
to disable it from the build
* Additional documentation :
REQUIREMENTS
supporting libraries for plugins
GStreamer is developed under the terms of the LGPL (see LICENSE file for
details). Some of our plug-ins however rely on libraries which are available
under other licenses. This means that if you are using an application which
has a non-GPL compatible license (for instance a closed-source application)
with GStreamer, you have to make sure not to use GPL-linked plug-ins.
When using GPL-linked plug-ins, GStreamer is for all practical reasons
under the GPL itself.
The plug-ins which use a GPL library are as follows:
cdparanoia libcdparanoia (http://www.xiph.org/paranoia/)
aasink aalib (http://aa-project.sourceforge.net/aalib/)
xmms libxmms (http://www.xmms.org)
decdvd ac3dec,mpeg2dec (http://linuxvideo.org/mpeg2dec/,http://linuxvideo.org/ac3dec/)a
Plug-ins which use an LGPL library are as follows:
colorspace Hermes (http://www.clanlib.org/hermes/)
httpsrc libghttp (ftp.gnome.org/pub/GNOME/stable/sources/libghttp/)
alsasink alsa (http://alsa-project.org)
arts aRts (http://arts-project.org)
sdlsink libsdl (http://www.libsdl.org)
gnomevfssource gnome-vfs (ftp.gnome.org//pub/GNOME/stable/sources/gnome-vfs)
gnomevfssink gnome-vfs
esdsink libesd (ftp.gnome.org/pub/GNOME/stable/sources/esound)
icastsend libshout (http://www.icecast.org)
lame libmp3lame (http://www.mp3dev.org/mp3/)
gst1394 libraw1394 (http://linux1394.sourceforge.net)
flac libFLAC (http://flac.sourceforge.net)
RTP ortp (http://www.linphone.org/ortp/)
Plug-ins which use a BSD covered library are as follows:
vorbisenc libogg/libvorbis (http://www.xiph.org/ogg/vorbis)
vorbisdec libogg/libvorbis
Plug-ins based on libraries with other free licenses:
xvideosink libXv (MIT X11 / X Consortium license)
gsm libgsm (MIT license http://kbs.cs.tu-berlin.de/~jutta/toast.html)
Plug-ins using non-free libraries:
wincodec win32ddl (http://divx.euro.ru/)
GStreamer uses a *large* array of tools and libraries, most of which are
optional. We have attempted to make sure that any code that depends on
optional libraries doesn't get built unless you have those libraries. If
you find this not to be the case, please, let us know by filing a bug
report at http://sourceforge.net/bugs/?group_id=1936.
Required libraries:
===================
The core GStreamer libraries are required which depend on the following:
the latest glib2, currently at v2.0.4
libxml2 (also called gnome-xml, available from http://xmlsoft.org/)
These libraries are all central parts of gnome, and are available from the
ftp.gnome.org or its mirrors, amongst other places.
Optional libraries:
===================
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)
gdk_pixbuf
libgnomeui (for gstplay, gsteditor, autoplug example, several tests)
libglade (for gstplay, gsteditor)
libHermes (for colorspace conversions; you need this for any video work)
http://www.clanlib.org/hermes/
libghttp (for httpsrc)
http://ftp.gnome.org/pub/GNOME/stable/sources/libghttp/
libaudiofile (for afsrc/afsink)
http://oss.sgi.com/projects/audiofile/
libmad (for the mad mp3 decoder plugin)
http://www.mars.org/home/rob/proj/mpeg/
libjpeg (for jpegenc/jpegdec)
http://www.ijg.org/
libopenquicktime (for the QT plugin)
http://sourceforge.net/projects/openquicktime/
libXv (for videosink)
libxaudio (for xa mp3 decoder)
http://www.xaudio.com/
libvorbis (for vorbisenc, vorbisdec)
http://www.xiph.org/ogg/vorbis/index.html
libcdparanoia (for cdparanoia ripper)
http://www.xiph.org/paranoia/index.html
liblame (for lame mp3 encoder)
http://www.mp3dev.org/mp3/
libshout (for the shoutcast plugin)
http://www.icecast.org
libasound (for the alsa src/sink plugin)
http://alsa-project.org/
ortp (for the rtp sink plugin)
http://www.linphone.org/ortp/
aalib (for the aa sink plugin)
http://aa-project.sourceforge.net/aalib/
aRts (for the arts plugin wrapper, and the artsd sink)
http://www.arts-project.org
raw1394/linux1394 (for the dv plugin)
http://linux1394.sourceforge.net
libdvdread (for the dvdsrc)
http://www.dtek.chalmers.se/groups/dvd/
(optional: libcss for encrypted DVDs)
libesound (for the esd sink
ftp.gnome.org/pub/GNOME/stable/sources/esound)
gnome-vfs (for the gnome-vfs src)
libgsm (for the gsm plugin)
http://kbs.cs.tu-berlin.de/~jutta/toast.html
sdl (for the sdl sink)
http://www.libsdl.org
xmms (for the xmms plugins wrapper)
http://www.xmms.org
mpeg2dec/a52dec (for mpeg2 related plugins and dvd playback)
http://libmpeg2.sourceforge.net/
and http://liba52.sourceforge.net/
>= v0.2.1/v0.7.2
avifile (for the avi windows decoder plugins)
http://avifile.sourceforge.net/
you might want to get the windows libraries
from http://divx.euro.ru/ and put the .dll files
in /usr/lib/win32/
>= 0.6.0 (cvs)
flac (for the FLAC lossless audio format)
http://flac.sourceforge.net
Required tools:
===============
An extra set of tools is required if you wish to build GStreamer out of
CVS (using autogen.sh):
autoconf 2.52
automake 1.5
libtool v1.4 or better
pkgconfig 0.8.0 (http://www.freedesktop.org/software/pkgconfig/)
Optional tools:
===============
gtkdoc
db2html
fig2dev
xsltproc
Optional debian packages:
=========================
(This is an incomplete list, made only of problems which have been reported,
rather than by an audit.)
task-helix-gnome-dev OR libgnome-dev
gtk-doc-tools 0.4-0.2 -- needed to build documentation
Alternatively, the docbook-gnome-bin package, which is available by adding the
following lines to apt's sources.list (/etc/apt/sources.list):
deb ftp://ftp.home-of-linux.org/pub/debian gnome/
deb-src ftp://ftp.home-of-linux.org/pub/debian gnome/
......@@ -64,9 +64,11 @@ GST_CHECK_FEATURE(EXPERIMENTAL, [enable building of experimental plug-ins],,
[
AC_MSG_WARN(building experimental plug-ins)
USE_TARKIN="yes"
USE_RTP="yes"
],[
AC_MSG_NOTICE(not building experimental plug-ins)
USE_TARKIN="no"
USE_RTP="no"
])
dnl broken plug-ins; stuff that doesn't seem to build at the moment
......@@ -404,13 +406,12 @@ dnl AC_CHECK_LIB(cdda_paranoia, paranoia_init, : , HAVE_CDPARANOIA=no, -lcdda_in
dnl AC_CHECK_HEADER(cdda_paranoia.h, :, HAVE_CDPARANOIA=no)
dnl *** libdv ***
translit(dnm, m, l) AM_CONDITIONAL(USE_LIBDV, true)
GST_CHECK_FEATURE(LIBDV, [libdv DV/video decoder], dvdec, [
dnl use this when gtk deps are removed from its pkg-config .pc
dnl PKG_CHECK_MODULES(LIBDV, libdv, HAVE_LIBDV="yes", HAVE_LIBDV="no")
AM_PATH_LIBDV(HAVE_LIBDV="yes", HAVE_LIBDV="no")
AC_SUBST(LIBDV_CFLAGS)
AC_SUBST(LIBDV_LIBS)
translit(dnm, m, l) AM_CONDITIONAL(USE_DV, true)
GST_CHECK_FEATURE(DV, [libdv DV/video decoder], dvdec, [
dnl use pkg-config when gtk deps are removed from its pkg-config .pc
AM_PATH_LIBDV(HAVE_DV="yes", HAVE_DV="no")
AC_SUBST(DV_CFLAGS)
AC_SUBST(DV_LIBS)
])
dnl *** dvdread ***
......@@ -763,9 +764,9 @@ if test "x$USE_ATOMIC_H" = xyes; then
AC_DEFINE(HAVE_ATOMIC_H, 1, [Define if atomic.h header file is available])
fi
dnl if test "x$USE_DEBUG" = xyes; then
dnl CFLAGS="$CFLAGS -g"
dnl fi
if test "x$USE_DEBUG" = xyes; then
GST_CFLAGS="$GST_CFLAGS -g"
fi
if test "x$USE_PROFILING" = xyes; then
dnl CFLAGS="$CFLAGS -pg -fprofile-arcs"
......
SUBDIRS=dynparams seeking
if HAVE_GTK
GTK_SUBDIRS=dynparams seeking
else
GTK_SUBDIRS=
endif
SUBDIRS=$(GTK_SUBDIRS)
DIST_SUBDIRS=capsfilter dynparams seeking
......@@ -3,8 +3,8 @@ plugindir = $(libdir)/gst
plugin_LTLIBRARIES = libgstdvdec.la
libgstdvdec_la_SOURCES = gstdvdec.c
libgstdvdec_la_CFLAGS = $(GST_CFLAGS) $(LIBDV_CFLAGS)
libgstdvdec_la_LIBADD = $(LIBDV_LIBS)
libgstdvdec_la_CFLAGS = $(GST_CFLAGS) $(DV_CFLAGS)
libgstdvdec_la_LIBADD = $(DV_LIBS)
libgstdvdec_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
noinst_HEADERS = gstdvdec.h
......
This diff is collapsed.
......@@ -299,26 +299,26 @@ gst_avimux_sinkconnect (GstPad *pad, GstCaps *vscaps)
if (!strncmp (format, "strf_vids", 9)) {
avimux->vids.size = sizeof(gst_riff_strf_vids);
gst_caps_get (caps,
"width", GST_PROPS_INT_TYPE, &avimux->vids.width,
"height", GST_PROPS_INT_TYPE, &avimux->vids.height,
"planes", GST_PROPS_INT_TYPE, &avimux->vids.planes,
"bit_cnt", GST_PROPS_INT_TYPE, &avimux->vids.bit_cnt,
"compression", GST_PROPS_FOURCC_TYPE, &avimux->vids.compression,
"image_size", GST_PROPS_INT_TYPE, &avimux->vids.image_size,
"xpels_meter", GST_PROPS_INT_TYPE, &avimux->vids.xpels_meter,
"ypels_meter", GST_PROPS_INT_TYPE, &avimux->vids.ypels_meter,
"num_colors", GST_PROPS_INT_TYPE, &avimux->vids.num_colors,
"imp_colors", GST_PROPS_INT_TYPE, &avimux->vids.imp_colors,
"width", &avimux->vids.width,
"height", &avimux->vids.height,
"planes", &avimux->vids.planes,
"bit_cnt", &avimux->vids.bit_cnt,
"compression", &avimux->vids.compression,
"image_size", &avimux->vids.image_size,
"xpels_meter", &avimux->vids.xpels_meter,
"ypels_meter", &avimux->vids.ypels_meter,
"num_colors", &avimux->vids.num_colors,
"imp_colors", &avimux->vids.imp_colors,
NULL);
}
else if (!strncmp (format, "strf_auds", 9)) {
gst_caps_get (caps,
"format", GST_PROPS_INT_TYPE, &avimux->auds.format,
"channels", GST_PROPS_INT_TYPE, &avimux->auds.channels,
"rate", GST_PROPS_INT_TYPE, &avimux->auds.rate,
"av_bps", GST_PROPS_INT_TYPE, &avimux->auds.av_bps,
"blockalign", GST_PROPS_INT_TYPE, &avimux->auds.blockalign,
"size", GST_PROPS_INT_TYPE, &avimux->auds.size,
"format", &avimux->auds.format,
"channels", &avimux->auds.channels,
"rate", &avimux->auds.rate,
"av_bps", &avimux->auds.av_bps,
"blockalign", &avimux->auds.blockalign,
"size", &avimux->auds.size,
NULL);
}
goto done;
......@@ -336,10 +336,8 @@ gst_avimux_sinkconnect (GstPad *pad, GstCaps *vscaps)
case GST_MAKE_FOURCC('Y','4','1','P'):
case GST_MAKE_FOURCC('R','G','B',' '):
avimux->vids.size = sizeof(gst_riff_strf_vids);
gst_caps_get (caps,
"width", GST_PROPS_INT_TYPE, &avimux->vids.width,
"height", GST_PROPS_INT_TYPE, &avimux->vids.height,
NULL);
gst_caps_get (caps, "width", &avimux->vids.width,
"height", &avimux->vids.height, NULL);
avimux->vids.planes = 1;
switch (format)
{
......@@ -365,10 +363,8 @@ gst_avimux_sinkconnect (GstPad *pad, GstCaps *vscaps)
else if (!strcmp (mimetype, "video/jpeg"))
{
avimux->vids.size = sizeof(gst_riff_strf_vids);
gst_caps_get (caps,
"width", GST_PROPS_INT_TYPE, &avimux->vids.width,
"height", GST_PROPS_INT_TYPE, &avimux->vids.height,
NULL);
gst_caps_get (caps, "width", &avimux->vids.width,
"height", &avimux->vids.height, NULL);
avimux->vids.planes = 1;
avimux->vids.bit_cnt = 24;
avimux->vids.compression = GST_MAKE_FOURCC('M','J','P','G');
......@@ -380,12 +376,11 @@ gst_avimux_sinkconnect (GstPad *pad, GstCaps *vscaps)
gint width;
avimux->auds.format = GST_RIFF_WAVE_FORMAT_PCM;
gst_caps_get (caps,
"channels", GST_PROPS_INT_TYPE, &avimux->auds.channels,
"rate", GST_PROPS_INT_TYPE, &avimux->auds.rate,
"width", GST_PROPS_INT_TYPE, &width,
"depth", GST_PROPS_INT_TYPE, &avimux->auds.size,
NULL);
gst_caps_get (caps, "channels", &avimux->auds.channels,
"rate", &avimux->auds.rate,
"width", &width,
"depth", &avimux->auds.size,
NULL);
avimux->auds.av_bps = width * avimux->auds.rate * avimux->auds.channels / 8;
avimux->auds.blockalign = width * avimux->auds.channels/8;
goto done;
......
This diff is collapsed.
......@@ -8,5 +8,3 @@ libgsteffectv_la_LIBADD =
libgsteffectv_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
noinst_HEADERS = gsteffectv.h
EXTRA_DIST = LICENSE
SUBDIRS=dynparams seeking
if HAVE_GTK
GTK_SUBDIRS=dynparams seeking
else
GTK_SUBDIRS=
endif
SUBDIRS=$(GTK_SUBDIRS)
DIST_SUBDIRS=capsfilter dynparams seeking
......@@ -54,6 +54,7 @@ sub read_config
sub playfile($$)
{
my ($file, $ext) = @_;
$ext = lc $ext;
my $pipe;
if ($cfg{VISUALIZER} && ($pipe = $pipes{"vis." . $ext}))
......@@ -88,7 +89,7 @@ read_config ();
"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 name=foo video_%02d! { queue ! mpeg2dec ! $cfg{VIDEOSINK} } foo.private_stream_1__%02d! { queue ! a52dec ! $cfg{AUDIOSINK} }",
"vob", "mpegdemux video_%02d! { queue ! mpeg2dec ! $cfg{VIDEOSINK} } mpegdemux0.private_stream_1_%02d! { queue ! a52dec ! $cfg{AUDIOSINK} }",
);
if ($cfg{VISUALIZER}) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment