Update upstream source from tag 'upstream/1.13.1'
Update to upstream version '1.13.1'
with Debian dir 8e09f1868156d599d8e832182f3883de2c5f4ba7
diff --git a/ChangeLog b/ChangeLog
index 1553496..38014c4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,428 +1,9 @@
-=== release 1.12.4 ===
-
-2017-12-07 Sebastian Dröge <slomo@coaxion.net>
-
- * configure.ac:
- releasing 1.12.4
-
-2017-12-07 19:08:11 +0200 Sebastian Dröge <sebastian@centricular.com>
-
- * po/id.po:
- * po/nl.po:
- * po/sv.po:
- po: Update translations
-
-2017-12-06 13:01:39 +0200 Sebastian Dröge <sebastian@centricular.com>
-
- * ext/cdio/gstcdio.c:
- * ext/cdio/gstcdio.h:
- * ext/cdio/gstcdiocddasrc.c:
- cdio: Fix build with cdio >= 1.0
- LIBCDIO_VERSION_NUM was defined as e.g. 94 for 0.94 but is now defined
- as 1 for 1.0. We had various checks for < 83, which of course succeeded
- now although we are >= 0.83.
- Fix this by checking for < 76 (0.76) too, as that is the minimum version
- we currently support and everything < 76 is going to be >= 1.0.
- https://bugzilla.gnome.org/show_bug.cgi?id=791301
-
-2017-09-26 10:11:24 +0530 Ponnam Srinivas <p.srinivas@samsung.com>
-
- * ext/a52dec/gsta52dec.c:
- a52dec: Fix out buffer memory leak in error code path
- https://bugzilla.gnome.org/show_bug.cgi?id=788119
-
-2017-09-15 17:06:58 +0530 Deepak Srivastava <srivastava.d@samsung.com>
-
- * ext/mpeg2dec/gstmpeg2dec.c:
- mpeg2dec: Fix buffer memory leak in error code path
- https://bugzilla.gnome.org/show_bug.cgi?id=787817
-
-2017-08-31 11:33:14 +0530 Satya Prakash Gupta <sp.gupta@samsung.com>
-
- * gst/realmedia/asmrules.c:
- realmedia: fix leak in asmrules error code path
- https://bugzilla.gnome.org/show_bug.cgi?id=787056
-
-2017-08-30 18:41:28 +0530 Satya Prakash Gupta <sp.gupta@samsung.com>
-
- * gst/realmedia/rtspreal.c:
- realmedia: Fix Memory leak in error case
- https://bugzilla.gnome.org/show_bug.cgi?id=787014
-
-=== release 1.12.3 ===
-
-2017-09-18 17:48:24 +0300 Sebastian Dröge <sebastian@centricular.com>
-
- * ChangeLog:
- * NEWS:
- * RELEASE:
- * configure.ac:
- * docs/plugins/inspect/plugin-a52dec.xml:
- * docs/plugins/inspect/plugin-amrnb.xml:
- * docs/plugins/inspect/plugin-amrwbdec.xml:
- * docs/plugins/inspect/plugin-asf.xml:
- * docs/plugins/inspect/plugin-cdio.xml:
- * docs/plugins/inspect/plugin-dvdlpcmdec.xml:
- * docs/plugins/inspect/plugin-dvdread.xml:
- * docs/plugins/inspect/plugin-dvdsub.xml:
- * docs/plugins/inspect/plugin-lame.xml:
- * docs/plugins/inspect/plugin-mpeg2dec.xml:
- * docs/plugins/inspect/plugin-mpg123.xml:
- * docs/plugins/inspect/plugin-realmedia.xml:
- * docs/plugins/inspect/plugin-siddec.xml:
- * docs/plugins/inspect/plugin-twolame.xml:
- * docs/plugins/inspect/plugin-x264.xml:
- * docs/plugins/inspect/plugin-xingmux.xml:
- * gst-plugins-ugly.doap:
- * meson.build:
- Release 1.12.3
-
-2017-09-18 16:20:11 +0300 Sebastian Dröge <sebastian@centricular.com>
-
- * po/af.po:
- * po/az.po:
- * po/bg.po:
- * po/ca.po:
- * po/cs.po:
- * po/da.po:
- * po/de.po:
- * po/el.po:
- * po/en_GB.po:
- * po/eo.po:
- * po/es.po:
- * po/eu.po:
- * po/fi.po:
- * po/fr.po:
- * po/fur.po:
- * po/gl.po:
- * po/hr.po:
- * po/hu.po:
- * po/id.po:
- * po/it.po:
- * po/ja.po:
- * po/lt.po:
- * po/lv.po:
- * po/ms.po:
- * po/mt.po:
- * po/nb.po:
- * po/nl.po:
- * po/or.po:
- * po/pl.po:
- * po/pt_BR.po:
- * po/ro.po:
- * po/ru.po:
- * po/sk.po:
- * po/sl.po:
- * po/sq.po:
- * po/sr.po:
- * po/sv.po:
- * po/tr.po:
- * po/uk.po:
- * po/vi.po:
- * po/zh_CN.po:
- Update .po files
-
-2017-09-18 16:03:32 +0300 Sebastian Dröge <sebastian@centricular.com>
-
- * po/id.po:
- * po/it.po:
- * po/sv.po:
- po: Update translations
-
-2017-09-07 13:27:26 +0530 Satya Prakash Gupta <sp.gupta@samsung.com>
-
- * ext/mpeg2dec/gstmpeg2dec.c:
- mpeg2dec: Unmap output video frame if copying to it fails
- https://bugzilla.gnome.org/show_bug.cgi?id=787398
-
-2017-08-17 12:13:58 +0100 Tim-Philipp Müller <tim@centricular.com>
-
- * README:
- * common:
- Automatic update of common submodule
- From 48a5d85 to dd9d403
-
-2017-07-25 13:36:17 +0530 Satya Prakash Gupta <sp.gupta@samsung.com>
-
- * ext/dvdread/dvdreadsrc.c:
- dvdreadsrc: Fix string memory leak
- https://bugzilla.gnome.org/show_bug.cgi?id=785388
-
-2017-07-15 14:57:49 +0100 Tim-Philipp Müller <tim@centricular.com>
-
- * ext/mpg123/gstmpg123audiodec.c:
- mpg123audiodec: fix caps leak
- The pad template takes its own ref, so we should unref the caps.
- https://bugzilla.gnome.org/show_bug.cgi?id=784982
-
-2017-07-15 14:59:42 +0100 Tim-Philipp Müller <tim@centricular.com>
-
- * ext/x264/gstx264enc.c:
- x264enc: fix caps leak
- Move creation of supported sink pads into class_init function
- which is also the only place where they're used. Unref the
- caps when no longer needed, the pad template will take its
- own ref.
- https://bugzilla.gnome.org/show_bug.cgi?id=784982
-
-=== release 1.12.2 ===
-
-2017-07-14 14:03:52 +0300 Sebastian Dröge <sebastian@centricular.com>
-
- * ChangeLog:
- * NEWS:
- * RELEASE:
- * configure.ac:
- * docs/plugins/inspect/plugin-a52dec.xml:
- * docs/plugins/inspect/plugin-amrnb.xml:
- * docs/plugins/inspect/plugin-amrwbdec.xml:
- * docs/plugins/inspect/plugin-asf.xml:
- * docs/plugins/inspect/plugin-cdio.xml:
- * docs/plugins/inspect/plugin-dvdlpcmdec.xml:
- * docs/plugins/inspect/plugin-dvdread.xml:
- * docs/plugins/inspect/plugin-dvdsub.xml:
- * docs/plugins/inspect/plugin-lame.xml:
- * docs/plugins/inspect/plugin-mpeg2dec.xml:
- * docs/plugins/inspect/plugin-mpg123.xml:
- * docs/plugins/inspect/plugin-realmedia.xml:
- * docs/plugins/inspect/plugin-siddec.xml:
- * docs/plugins/inspect/plugin-twolame.xml:
- * docs/plugins/inspect/plugin-x264.xml:
- * docs/plugins/inspect/plugin-xingmux.xml:
- * gst-plugins-ugly.doap:
- * meson.build:
- Release 1.12.2
-
-2017-07-14 13:36:56 +0300 Sebastian Dröge <sebastian@centricular.com>
-
- * po/af.po:
- * po/az.po:
- * po/bg.po:
- * po/ca.po:
- * po/cs.po:
- * po/da.po:
- * po/de.po:
- * po/el.po:
- * po/en_GB.po:
- * po/eo.po:
- * po/es.po:
- * po/eu.po:
- * po/fi.po:
- * po/fr.po:
- * po/fur.po:
- * po/gl.po:
- * po/hr.po:
- * po/hu.po:
- * po/id.po:
- * po/it.po:
- * po/ja.po:
- * po/lt.po:
- * po/lv.po:
- * po/ms.po:
- * po/mt.po:
- * po/nb.po:
- * po/nl.po:
- * po/or.po:
- * po/pl.po:
- * po/pt_BR.po:
- * po/ro.po:
- * po/ru.po:
- * po/sk.po:
- * po/sl.po:
- * po/sq.po:
- * po/sr.po:
- * po/sv.po:
- * po/tr.po:
- * po/uk.po:
- * po/vi.po:
- * po/zh_CN.po:
- Update .po files
-
-2017-07-14 13:23:18 +0300 Sebastian Dröge <sebastian@centricular.com>
-
- * po/id.po:
- * po/it.po:
- * po/sv.po:
- po: Update translations
-
-2017-06-27 11:48:08 +0200 Edward Hervey <edward@centricular.com>
-
- * gst/asfdemux/gstasfdemux.c:
- asfdemux: More index handling
- In the same vein as the previous commit, the end of the file might have been
- cut and therefore contains bogus data.
- If the object is too short, consider it as garbage and return a non-fatal
- flow.
- Regression introduced in 97294eb8bbed1b9dad7d3f2c52dd69eb1812cc06
-
-2017-06-27 10:25:42 +0200 Edward Hervey <edward@centricular.com>
-
- * gst/asfdemux/gstasfdemux.c:
- asfdemux; Don't assume index is present at end of file
- Some files have garbage at the end of the file, don't error out if we don't
- find the index there.
- Reverts back to previous behaviour (where corrupted/missing indexex were
- not a fatal error).
- Regression introduced in 97294eb8bbed1b9dad7d3f2c52dd69eb1812cc06
-
-=== release 1.12.1 ===
-
-2017-06-20 12:07:16 +0300 Sebastian Dröge <sebastian@centricular.com>
-
- * ChangeLog:
- * NEWS:
- * RELEASE:
- * configure.ac:
- * docs/plugins/inspect/plugin-a52dec.xml:
- * docs/plugins/inspect/plugin-amrnb.xml:
- * docs/plugins/inspect/plugin-amrwbdec.xml:
- * docs/plugins/inspect/plugin-asf.xml:
- * docs/plugins/inspect/plugin-cdio.xml:
- * docs/plugins/inspect/plugin-dvdlpcmdec.xml:
- * docs/plugins/inspect/plugin-dvdread.xml:
- * docs/plugins/inspect/plugin-dvdsub.xml:
- * docs/plugins/inspect/plugin-lame.xml:
- * docs/plugins/inspect/plugin-mpeg2dec.xml:
- * docs/plugins/inspect/plugin-mpg123.xml:
- * docs/plugins/inspect/plugin-realmedia.xml:
- * docs/plugins/inspect/plugin-siddec.xml:
- * docs/plugins/inspect/plugin-twolame.xml:
- * docs/plugins/inspect/plugin-x264.xml:
- * docs/plugins/inspect/plugin-xingmux.xml:
- * gst-plugins-ugly.doap:
- * meson.build:
- Release 1.12.1
-
-2017-06-20 11:29:39 +0300 Sebastian Dröge <sebastian@centricular.com>
-
- * po/af.po:
- * po/az.po:
- * po/bg.po:
- * po/ca.po:
- * po/cs.po:
- * po/da.po:
- * po/de.po:
- * po/el.po:
- * po/en_GB.po:
- * po/eo.po:
- * po/es.po:
- * po/eu.po:
- * po/fi.po:
- * po/fr.po:
- * po/fur.po:
- * po/gl.po:
- * po/hr.po:
- * po/hu.po:
- * po/id.po:
- * po/it.po:
- * po/ja.po:
- * po/lt.po:
- * po/lv.po:
- * po/ms.po:
- * po/mt.po:
- * po/nb.po:
- * po/nl.po:
- * po/or.po:
- * po/pl.po:
- * po/pt_BR.po:
- * po/ro.po:
- * po/ru.po:
- * po/sk.po:
- * po/sl.po:
- * po/sq.po:
- * po/sr.po:
- * po/sv.po:
- * po/tr.po:
- * po/uk.po:
- * po/vi.po:
- * po/zh_CN.po:
- Update .po files
-
-2017-06-20 11:10:11 +0300 Sebastian Dröge <sebastian@centricular.com>
-
- * po/id.po:
- * po/sv.po:
- po: Update translations
-
-2017-06-06 21:48:19 -0700 Thiago Santos <thiagossantos@gmail.com>
-
- * gst/asfdemux/gstasfdemux.c:
- asfdemux: fix checking for header objects
- The if 'and' condition was mixed up with the last parameter of the
- function and would lead to wrong results
-
=== release 1.12.0 ===
-2017-05-04 15:39:25 +0300 Sebastian Dröge <sebastian@centricular.com>
+2017-05-04 Sebastian Dröge <slomo@coaxion.net>
- * ChangeLog:
- * NEWS:
- * RELEASE:
* configure.ac:
- * docs/plugins/inspect/plugin-a52dec.xml:
- * docs/plugins/inspect/plugin-amrnb.xml:
- * docs/plugins/inspect/plugin-amrwbdec.xml:
- * docs/plugins/inspect/plugin-asf.xml:
- * docs/plugins/inspect/plugin-cdio.xml:
- * docs/plugins/inspect/plugin-dvdlpcmdec.xml:
- * docs/plugins/inspect/plugin-dvdread.xml:
- * docs/plugins/inspect/plugin-dvdsub.xml:
- * docs/plugins/inspect/plugin-lame.xml:
- * docs/plugins/inspect/plugin-mpeg2dec.xml:
- * docs/plugins/inspect/plugin-mpg123.xml:
- * docs/plugins/inspect/plugin-realmedia.xml:
- * docs/plugins/inspect/plugin-siddec.xml:
- * docs/plugins/inspect/plugin-twolame.xml:
- * docs/plugins/inspect/plugin-x264.xml:
- * docs/plugins/inspect/plugin-xingmux.xml:
- * gst-plugins-ugly.doap:
- * meson.build:
- Release 1.12.0
-
-2017-05-04 15:12:50 +0300 Sebastian Dröge <sebastian@centricular.com>
-
- * po/af.po:
- * po/az.po:
- * po/bg.po:
- * po/ca.po:
- * po/cs.po:
- * po/da.po:
- * po/de.po:
- * po/el.po:
- * po/en_GB.po:
- * po/eo.po:
- * po/es.po:
- * po/eu.po:
- * po/fi.po:
- * po/fr.po:
- * po/fur.po:
- * po/gl.po:
- * po/hr.po:
- * po/hu.po:
- * po/id.po:
- * po/it.po:
- * po/ja.po:
- * po/lt.po:
- * po/lv.po:
- * po/ms.po:
- * po/mt.po:
- * po/nb.po:
- * po/nl.po:
- * po/or.po:
- * po/pl.po:
- * po/pt_BR.po:
- * po/ro.po:
- * po/ru.po:
- * po/sk.po:
- * po/sl.po:
- * po/sq.po:
- * po/sr.po:
- * po/sv.po:
- * po/tr.po:
- * po/uk.po:
- * po/vi.po:
- * po/zh_CN.po:
- Update .po files
+ releasing 1.12.0
2017-05-04 13:47:56 +0300 Sebastian Dröge <sebastian@centricular.com>
diff --git a/Makefile.am b/Makefile.am
index 214f1b0..ad6fd4d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,7 +8,7 @@
AUTHORS COPYING NEWS README RELEASE REQUIREMENTS \
ChangeLog gst-plugins-ugly.doap autogen.sh \
$(shell find "$(top_srcdir)" -type f -name meson.build ! -path "$(top_srcdir)/$(PACKAGE_TARNAME)-*" ) \
- meson_options.txt config.h.meson
+ meson_options.txt
DISTCLEANFILES = _stdint.h
@@ -40,10 +40,17 @@
$(top_builddir)/gst-plugins-ugly.spec \
$(top_builddir)/common/shave \
$(top_builddir)/common/shave-libtool \
+ $(top_builddir)/ext/mpg123/.libs/libgstmpg123.so \
+ $(top_builddir)/ext/lame/.libs/libgstlame.so \
+ $(top_builddir)/ext/twolame/.libs/libgsttwolame.so \
$(top_builddir)/gst/realmedia/.libs/libgstrmdemux.so
CRUFT_DIRS = \
+ $(top_builddir)/tests/check/pipelines \
$(top_srcdir)/docs/plugins/tmpl \
+ $(top_srcdir)/ext/mpg123/ \
+ $(top_srcdir)/ext/lame/ \
+ $(top_srcdir)/ext/twolame/ \
$(top_builddir)/win32 \
$(top_srcdir)/win32
diff --git a/Makefile.in b/Makefile.in
index b91e130..c32380e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -293,6 +293,7 @@
ERROR_CFLAGS = @ERROR_CFLAGS@
ERROR_CXXFLAGS = @ERROR_CXXFLAGS@
EXEEXT = @EXEEXT@
+EXTRA_CFLAGS = @EXTRA_CFLAGS@
FFLAGS = @FFLAGS@
FGREP = @FGREP@
GCOV = @GCOV@
@@ -344,7 +345,6 @@
GST_PLUGINS_NONPORTED = @GST_PLUGINS_NONPORTED@
GST_PLUGINS_SELECTED = @GST_PLUGINS_SELECTED@
GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
-GST_PLUGIN_LIBTOOLFLAGS = @GST_PLUGIN_LIBTOOLFLAGS@
GST_PREFIX = @GST_PREFIX@
GST_REVISION = @GST_REVISION@
GST_TOOLS_DIR = @GST_TOOLS_DIR@
@@ -355,7 +355,6 @@
GTKDOC_REBASE = @GTKDOC_REBASE@
HAVE_CXX = @HAVE_CXX@
HAVE_DVDREAD = @HAVE_DVDREAD@
-HAVE_LAME = @HAVE_LAME@
HTML_DIR = @HTML_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
@@ -364,8 +363,6 @@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INTLLIBS = @INTLLIBS@
INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-LAME_CFLAGS = @LAME_CFLAGS@
-LAME_LIBS = @LAME_LIBS@
LD = @LD@
LDFLAGS = @LDFLAGS@
LIBICONV = @LIBICONV@
@@ -387,8 +384,6 @@
MKDIR_P = @MKDIR_P@
MPEG2DEC_CFLAGS = @MPEG2DEC_CFLAGS@
MPEG2DEC_LIBS = @MPEG2DEC_LIBS@
-MPG123_CFLAGS = @MPG123_CFLAGS@
-MPG123_LIBS = @MPG123_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_015 = @MSGFMT_015@
MSGMERGE = @MSGMERGE@
@@ -431,13 +426,13 @@
SIDPLAY_CFLAGS = @SIDPLAY_CFLAGS@
SIDPLAY_LIBS = @SIDPLAY_LIBS@
STRIP = @STRIP@
-TWOLAME_CFLAGS = @TWOLAME_CFLAGS@
-TWOLAME_LIBS = @TWOLAME_LIBS@
USE_NLS = @USE_NLS@
VALGRIND_CFLAGS = @VALGRIND_CFLAGS@
VALGRIND_LIBS = @VALGRIND_LIBS@
VALGRIND_PATH = @VALGRIND_PATH@
VERSION = @VERSION@
+VISIBILITY_CFLAGS = @VISIBILITY_CFLAGS@
+VISIBILITY_CXXFLAGS = @VISIBILITY_CXXFLAGS@
WARNING_CFLAGS = @WARNING_CFLAGS@
WARNING_CXXFLAGS = @WARNING_CXXFLAGS@
WIN32_LIBS = @WIN32_LIBS@
@@ -518,7 +513,7 @@
AUTHORS COPYING NEWS README RELEASE REQUIREMENTS \
ChangeLog gst-plugins-ugly.doap autogen.sh \
$(shell find "$(top_srcdir)" -type f -name meson.build ! -path "$(top_srcdir)/$(PACKAGE_TARNAME)-*" ) \
- meson_options.txt config.h.meson
+ meson_options.txt
DISTCLEANFILES = _stdint.h
@@ -527,10 +522,17 @@
$(top_builddir)/gst-plugins-ugly.spec \
$(top_builddir)/common/shave \
$(top_builddir)/common/shave-libtool \
+ $(top_builddir)/ext/mpg123/.libs/libgstmpg123.so \
+ $(top_builddir)/ext/lame/.libs/libgstlame.so \
+ $(top_builddir)/ext/twolame/.libs/libgsttwolame.so \
$(top_builddir)/gst/realmedia/.libs/libgstrmdemux.so
CRUFT_DIRS = \
+ $(top_builddir)/tests/check/pipelines \
$(top_srcdir)/docs/plugins/tmpl \
+ $(top_srcdir)/ext/mpg123/ \
+ $(top_srcdir)/ext/lame/ \
+ $(top_srcdir)/ext/twolame/ \
$(top_builddir)/win32 \
$(top_srcdir)/win32
diff --git a/NEWS b/NEWS
index 62d10ed..385e4b6 100644
--- a/NEWS
+++ b/NEWS
@@ -1,22 +1,18 @@
-# GStreamer 1.12 Release Notes
+# GStreamer 1.14 Release Notes
-GStreamer 1.12.0 was originally released on 4th May 2017.
-The latest bug-fix release in the 1.12 series is [1.12.4](#1.12.4) and was
-released on 7 December 2017.
+GStreamer 1.14.0 has not been released yet. It is scheduled for release
+in late February / early March 2018.
-The GStreamer team is proud to announce a new major feature release in the
-stable 1.x API series of your favourite cross-platform multimedia framework!
+There are unstable pre-releases available for testing and development purposes.
+The latest pre-release is version 1.13.1 and was released on 15 February 2018.
-As always, this release is again packed with new features, bug fixes and other
-improvements.
-
-See [https://gstreamer.freedesktop.org/releases/1.12/][latest] for the latest
+See [https://gstreamer.freedesktop.org/releases/1.14/][latest] for the latest
version of this document.
-*Last updated: Thursday 7 December 2017, 16:30 UTC [(log)][gitlog]*
+*Last updated: Thursday 15 February 2018, 16:30 UTC [(log)][gitlog]*
-[latest]: https://gstreamer.freedesktop.org/releases/1.12/
-[gitlog]: https://cgit.freedesktop.org/gstreamer/www/log/src/htdocs/releases/1.12/release-notes-1.12.md
+[latest]: https://gstreamer.freedesktop.org/releases/1.14/
+[gitlog]: https://cgit.freedesktop.org/gstreamer/www/log/src/htdocs/releases/1.14/release-notes-1.14.md
## Introduction
@@ -28,819 +24,127 @@
## Highlights
-- new `msdk` plugin for Intel's Media SDK for hardware-accelerated video
- encoding and decoding on Intel graphics hardware on Windows or Linux.
-
-- `x264enc` can now use multiple x264 library versions compiled for different
- bit depths at runtime, to transparently provide support for multiple bit
- depths.
-
-- `videoscale` and `videoconvert` now support multi-threaded scaling and
- conversion, which is particularly useful with higher resolution video.
-
-- `h264parse` will now automatically insert AU delimiters if needed when
- outputting byte-stream format, which improves standard compliance and
- is needed in particular for HLS playback on iOS/macOS.
-
-- `rtpbin` has acquired bundle support for incoming streams
+- this section will be completed shortly
## Major new features and changes
### Noteworthy new API
-- The video library gained support for a number of new video formats:
-
- - `GBR_12LE`, `GBR_12BE`, `GBRA_12LE`, `GBRA_12BE` (planar 4:4:4 RGB/RGBA, 12 bits per channel)
- - `GBRA_10LE`, `GBRA_10BE` (planar 4:4:4:4 RGBA, 10 bits per channel)
- - `GBRA` (planar 4:4:4:4 ARGB, 8 bits per channel)
- - `I420_12BE`, `I420_12LE` (planar 4:2:0 YUV, 12 bits per channel)
- - `I422_12BE`,`I422_12LE` (planar 4:2:2 YUV, 12 bits per channel)
- - `Y444_12BE`, `Y444_12LE` (planar 4:4:4 YUV, 12 bits per channel)
- - `VYUY` (another packed 4:2:2 YUV format)
-
-- The high-level `GstPlayer` API was extended with functions for taking video
- snapshots and enabling accurate seeking. It can optionally also use the
- still-experimental `playbin3` element now.
+- this section will be filled in shortly
### New Elements
-- msdk: new plugin for Intel's Media SDK for hardware-accelerated video encoding
- and decoding on Intel graphics hardware on Windows or Linux. This includes
- an H.264 encoder/decoder (`msdkh264dec`, `msdkh264enc`),
- an H.265 encoder/decoder (`msdkh265dec`, `msdkh265enc`),
- an MJPEG encoder/encoder (`msdkmjpegdec`, `msdkmjpegenc`),
- an MPEG-2 video encoder (`msdkmpeg2enc`) and a VP8 encoder (`msdkvp8enc`).
-
-- `iqa` is a new Image Quality Assessment plugin based on [DSSIM][dssim],
- similar to the old (unported) videomeasure element.
-
-- The `faceoverlay` element, which allows you to overlay SVG graphics over
- a detected face in a video stream, has been ported from 0.10.
-
-- our `ffmpeg` wrapper plugin now exposes/maps the ffmpeg Opus audio decoder
- (`avdec_opus`) as well as the GoPro CineForm HD / CFHD decoder (`avdec_cfhd`),
- and also a parser/writer for the IVF format (`avdemux_ivf` and `avmux_ivf`).
-
-- `audiobuffersplit` is a new element that splits raw audio buffers into
- equal-sized buffers
-
-- `audiomixmatrix` is a new element that mixes N:M audio channels according to
- a configured mix matrix.
-
-- The `timecodewait` element got renamed to `avwait` and can operate in
- different modes now.
-
-- The `opencv` video processing plugin has gained a new `dewarp` element that
- dewarps fisheye images.
-
-- `ttml` is a new plugin for parsing and rendering subtitles in Timed Text
- Markup Language (TTML) format. For the time being these elements will not
- be autoplugged during media playback however, unless the `GST_TTML_AUTOPLUG=1`
- environment variable is set. Only the EBU-TT-D profile is supported at this
- point.
-
-[dssim]: https://github.com/pornel/dssim
+- this section will be filled in shortly
### New element features and additions
-- `x264enc` can now use multiple x264 library versions compiled for different
- bit depths at runtime, to transparently provide support for multiple bit
- depths. A new configure parameter `--with-x264-libraries` has been added to
- specify additional paths to look for additional x264 libraries to load.
- Background is that the libx264 library is always compile for one specific
- bit depth and the `x264enc` element would simply support the depth supported
- by the underlying library. Now we can support multiple depths.
+- this section will be filled in shortly
-- `x264enc` also picks up the interlacing mode automatically from the input
- caps now and passed interlacing/TFF information correctly to the library.
+### Plugin and library moves
-- `videoscale` and `videoconvert` now support multi-threaded scaling and
- conversion, which is particularly useful with higher resolution video.
- This has to be enabled explicitly via the `"n-threads"` property.
-
-- `videorate`'s new `"rate"` property lets you set a speed factor
- on the output stream
-
-- `splitmuxsink`'s buffer collection and scheduling was rewritten to make
- processing and splitting deterministic; before it was possible for a buffer
- to end up in a different file chunk in different runs. `splitmuxsink` also
- gained a new `"format-location-full"` signal that works just like the existing
- `"format-location"` signal only that it is also passed the primary stream's
- first buffer as argument, so that it is possible to construct the file name
- based on metadata such as the buffer timestamp or any GstMeta attached to
- the buffer. The new `"max-size-timecode"` property allows for timecode-based
- splitting. `splitmuxsink` will now also automatically start a new file if the
- input caps change in an incompatible way.
-
-- `fakesink` has a new `"drop-out-of-segment"` property to not drop
- out-of-segment buffers, which is useful for debugging purposes.
-
-- `identity` gained a `"ts-offset"` property.
-
-- both `fakesink` and `identity` now also print what kind of metas are attached
- to buffers when printing buffer details via the `"last-message"` property
- used by `gst-launch-1.0 -v`.
-
-- multiqueue: made `"min-interleave-time"` a configurable property.
-
-- video nerds will be thrilled to know that `videotestsrc`'s snow is now
- deterministic. `videotestsrc` also gained some new properties to make the
- ball pattern based on system time, and invert colours each second
- (`"animation-mode"`, `"motion"`, and `"flip"` properties).
-
-- `oggdemux` reverse playback should work again now. You're welcome.
-
-- `playbin3` and `urisourcebin` now have buffering enabled by default, and
- buffering message aggregation was fixed.
-
-- `tcpclientsrc` now has a `"timeout"` property
-
-- `appsink` has gained support for buffer lists. For backwards compatibility
- reasons users need to enable this explicitly with `gst_app_sink_set_buffer_list_support()`,
- however. Once activated, a pulled `GstSample` can contain either a buffer
- list or a single buffer.
-
-- `splitmuxsrc` reverse playback was fixed and handling of sparse streams, such
- as subtitle tracks or metadata tracks, was improved.
-
-- `matroskamux` has acquired support for muxing G722 audio; it also marks all
- buffers as keyframes now when streaming only audio, so that `tcpserversink`
- will behave properly with audio-only streams.
-
-- `qtmux` gained support for ProRes 4444 XQ, HEVC/H.265 and CineForm (GoPro) formats,
- and generally writes more video stream-related metadata into the track headers.
- It is also allows configuration of the maximum interleave size in bytes and
- time now. For fragmented mp4 we always write the `tfdt` atom now as required
- by the DASH spec.
-
-- `qtdemux` supports FLAC, xvid, mp2, S16L and CineForm (GoPro) tracks now, and
- generally tries harder to extract more video-related information from track
- headers, such as colorimetry or interlacing details. It also received a
- couple of fixes for the scenario where upstream operates in TIME format and
- feeds chunks to qtdemux (e.g. DASH or MSE).
-
-- `audioecho` has two new properties to apply a delay only to certain channels
- to create a surround effect, rather than an echo on all channels. This is
- useful when upmixing from stereo, for example. The `"surround-delay"` property
- enables this, and the `"surround-mask"` property controls which channels
- are considered surround sound channels in this case.
-
-- `webrtcdsp` gained various new properties for gain control and also exposes
- voice activity detection now, in which case it will post `"voice-activity"`
- messages on the bus whenever the voice detection status changes.
-
-- The `decklink` capture elements for Blackmagic Decklink cards have seen a
- number of improvements:
-
- - `decklinkvideosrc` will post a warning message on "no signal" and an info
- message when the signal lock has been (re)acquired. There is also a new
- read-only `"signal"` property that can be used to query the signal lock
- status. The `GAP` flag will be set on buffers that are captured without
- a signal lock. The new `drop-no-signal-frames` will make `decklinkvideosrc`
- drop all buffers that have been captured without an input signal. The
- `"skip-first-time"` property will make the source drop the first few
- buffers, which is handy since some devices will at first output buffers
- with the wrong resolution before they manage to figure out the right input
- format and decide on the actual output caps.
-
- - `decklinkaudiosrc` supports more than just 2 audio channels now.
-
- - The capture sources no longer use the "hardware" timestamps which turn
- out to be useless and instead just use the pipeline clock directly.
-
-- `srtpdec` now also has a readonly `"stats"` property, just like `srtpenc`.
-
-- `rtpbin` gained RTP bundle support, as used by e.g. WebRTC. The first
- rtpsession will have a `rtpssrcdemux` element inside splitting the streams
- based on their SSRC and potentially dispatch to a different rtpsession.
- Because retransmission SSRCs need to be merged with the corresponding media
- stream the `::on-bundled-ssrc` signal is emitted on `rtpbin` so that the
- application can find out to which session the SSRC belongs.
-
-- `rtprtxqueue` gained two new properties exposing retransmission
- statistics (`"requests"` and `"fulfilled-requests"`)
-
-- `kmssink` will now use the preferred mode for the monitor and render to the
- base plane if nothing else has set a mode yet. This can also be done forcibly
- in any case via the new `"force-modesetting"` property. Furthermore, `kmssink`
- now allows only the supported connector resolutions as input caps in order to
- avoid scaling or positioning of the input stream, as `kmssink` can't know
- whether scaling or positioning would be more appropriate for the use case at
- hand.
-
-- `waylandsink` can now take DMAbuf buffers as input in the presence
- of a compatible Wayland compositor. This enables zero-copy transfer
- from a decoder or source that outputs DMAbuf. It will also set surface
- opacity hint to allow better rendering optimization in the compositor.
-
-- `udpsrc` can be bound to more than one interface when joining a
- multicast group, this is done by giving a comma separate list of
- interfaces such as multicast-iface="eth0,eth1".
-
-### Plugin moves
-
-- `dataurisrc` moved from gst-plugins-bad to core
-
-- The `rawparse` plugin containing the `rawaudioparse` and `rawvideoparse`
- elements moved from gst-plugins-bad to gst-plugins-base. These elements
- supersede the old `videoparse` and `audioparse` elements. They work the
- same, with just some minor API changes. The old legacy elements still
- exist in gst-plugins-bad, but may be removed at some point in the future.
-
-- `timecodestamper` is an element that attaches time codes to video buffers
- in form of `GstVideoTimeCodeMeta`s. It had a `"clock-source"` property
- which has now been removed because it was fairly useless in practice. It
- gained some new properties however: the `"first-timecode"` property can
- be used to set the inital timecode; alternatively `"first-timecode-to-now"`
- can be set, and then the current system time at the time the first buffer
- arrives is used as base time for the time codes.
-
+- this section will be filled in shortly
### Plugin removals
-- The `mad` mp1/mp2/mp3 decoder plugin was removed from gst-plugins-ugly,
- as libmad is GPL licensed, has been unmaintained for a very long time, and
- there are better alternatives available. Use the `mpg123audiodec` element
- from the `mpg123` plugin in gst-plugins-ugly instead, or `avdec_mp3` from
- the `gst-libav` module which wraps the ffmpeg library. We expect that we
- will be able to move mp3 decoding to gst-plugins-good in the next cycle
- seeing that most patents around mp3 have expired recently or are about to
- expire.
+- this section will be filled in shortly
-- The `mimic` plugin was removed from gst-plugins-bad. It contained a decoder
- and encoder for a video codec used by MSN messenger many many years ago (in
- a galaxy far far away). The underlying library is unmaintained and no one
- really needs to use this codec any more. Recorded videos can still be played
- back with the MIMIC decoder in gst-libav.
## Miscellaneous API additions
-- Request pad name templates passed to `gst_element_request_pad()` may now
- contain multiple specifiers, such as e.g. `src_%u_%u`.
-
-- [`gst_buffer_iterate_meta_filtered()`][buffer-iterate-meta-filtered] is a
- variant of `gst_buffer_iterate_meta()` that only returns metas of the
- requested type and skips all other metas.
-
-- [`gst_pad_task_get_state()`][pad-task-get-state] gets the current state of
- a task in a thread-safe way.
-
-- [`gst_uri_get_media_fragment_table()`][uri-get-fragment-table] provides the
- media fragments of an URI as a table of key=value pairs.
-
-- [`gst_print()`][print], [`gst_println()`][println], [`gst_printerr()`][printerr],
- and [`gst_printerrln()`][printerrln] can be used to print to stdout or stderr.
- These functions are similar to `g_print()` and `g_printerr()` but they also
- support all the additional format specifiers provided by the GStreamer
- logging system, such as e.g. `GST_PTR_FORMAT`.
-
-- a `GstParamSpecArray` has been added, for elements who want to have array
- type properties, such as the `audiomixmatrix` element for example. There are
- also two new functions to set and get properties of this type from bindings:
- - gst_util_set_object_array()
- - gst_util_get_object_array()
-
-- various helper functions have been added to make it easier to set or get
- GstStructure fields containing caps-style array or list fields from language
- bindings (which usually support GValueArray but don't know about the GStreamer
- specific fundamental types):
- - [`gst_structure_get_array()`][get-array]
- - [`gst_structure_set_array()`][set-array]
- - [`gst_structure_get_list()`][get-list]
- - [`gst_structure_set_list()`][set-list]
-
-- a new ['dynamic type' registry factory type][dynamic-type] was added to
- register dynamically loadable GType types. This is useful for automatically
- loading enum/flags types that are used in caps, such as for example the
- `GstVideoMultiviewFlagsSet` type used in multiview video caps.
-
-- there is a new [`GstProxyControlBinding`][proxy-control-binding] for use
- with GstController. This allows proxying the control interface from one
- property on one GstObject to another property (of the same type) in another
- GstObject. So e.g. in parent-child relationship, one may need to call
- `gst_object_sync_values()` on the child and have a binding (set elsewhere)
- on the parent update the value. This is used in `glvideomixer` and `glsinkbin`
- for example, where `sync_values()` on the child pad or element will call
- `sync_values()` on the exposed bin pad or element.
-
- Note that this doesn't solve GObject property forwarding, that must
- be taken care of by the implementation manually or using GBinding.
-
-- `gst_base_parse_drain()` has been made public for subclasses to use.
-
-- `gst_base_sink_set_drop_out_of_segment()' can be used by subclasses to
- prevent GstBaseSink from dropping buffers that fall outside of the segment.
-
-- [`gst_calculate_linear_regression()`][calc-lin-regression] is a new utility
- function to calculate a linear regression.
-
-- [`gst_debug_get_stack_trace`][get-stack-trace] is an easy way to retrieve a
- stack trace, which can be useful in tracer plugins.
-
-- allocators: the dmabuf allocator is now sub-classable, and there is a new
- `GST_CAPS_FEATURE_MEMORY_DMABUF` define.
-
-- video decoder subclasses can use the newly-added function
- `gst_video_decoder_allocate_output_frame_with_params()` to
- pass a `GstBufferPoolAcquireParams` to the buffer pool for
- each buffer allocation.
-
-- the video time code API has gained a dedicated [`GstVideoTimeCodeInterval`][timecode-interval]
- type plus related API, including functions to add intervals to timecodes.
-
-- There is a new `libgstbadallocators-1.0` library in gst-plugins-bad, which
- may go away again in future releases once the `GstPhysMemoryAllocator`
- interface API has been validated by more users and was moved to
- `libgstallocators-1.0` from gst-plugins-base.
-
-[timecode-interval]: https://gstreamer.freedesktop.org/data/doc/gstreamer/head/gst-plugins-base-libs/html/gst-plugins-base-libs-gstvideo.html#gst-video-time-code-interval-new
-[buffer-iterate-meta-filtered]: https://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstBuffer.html#gst-buffer-iterate-meta-filtered
-[pad-task-get-state]: https://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstPad.html#gst-pad-task-get-state
-[uri-get-fragment-table]: https://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstUri.html#gst-uri-get-media-fragment-table
-[print]: https://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstInfo.html#gst-print
-[println]: https://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstInfo.html#gst-println
-[printerr]: https://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstInfo.html#gst-printerr
-[printerrln]: https://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstInfo.html#gst-printerrln
-[get-array]: https://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstStructure.html#gst-structure-get-array
-[set-array]: https://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstStructure.html#gst-structure-set-array
-[get-list]: https://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstStructure.html#gst-structure-get-list
-[set-list]: https://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstStructure.html#gst-structure-set-list
-[dynamic-type]: https://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstDynamicTypeFactory.html
-[proxy-control-binding]: https://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer-libs/html/gstreamer-libs-GstProxyControlBinding.html
-[calc-lin-regression]: https://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstUtils.html#gst-calculate-linear-regression
-[get-stack-trace]: https://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstUtils.html#gst-debug-get-stack-trace
+- this section will be filled in shortly
### GstPlayer
-New API has been added to:
-
- - get the number of audio/video/subtitle streams:
- - `gst_player_media_info_get_number_of_streams()`
- - `gst_player_media_info_get_number_of_video_streams()`
- - `gst_player_media_info_get_number_of_audio_streams()`
- - `gst_player_media_info_get_number_of_subtitle_streams()`
-
- - enable accurate seeking: `gst_player_config_set_seek_accurate()`
- and `gst_player_config_get_seek_accurate()`
-
- - get a snapshot image of the video in RGBx, BGRx, JPEG, PNG or
- native format: [`gst_player_get_video_snapshot()`][snapshot]
-
- - selecting use of a specific video sink element
- ([`gst_player_video_overlay_video_renderer_new_with_sink()`][renderer-with-vsink])
-
- - If the environment variable `GST_PLAYER_USE_PLAYBIN3` is set, GstPlayer will
- use the still-experimental `playbin3` element and the `GstStreams` API for
- playback.
-
-[snapshot]: https://gstreamer.freedesktop.org/data/doc/gstreamer/head/gst-plugins-bad-libs/html/gst-plugins-bad-libs-gstplayer.html#gst-player-get-video-snapshot
-[renderer-with-vsink]: https://gstreamer.freedesktop.org/data/doc/gstreamer/head/gst-plugins-bad-libs/html/gst-plugins-bad-libs-gstplayer-videooverlayvideorenderer.html#gst-player-video-overlay-video-renderer-new-with-sink
+- this section will be filled in shortly
## Miscellaneous changes
-- video caps for interlaced video may contain an optional `"field-order"` field
- now in the case of `interlaced-mode=interleaved` to signal that the field
- order is always the same throughout the stream. This is useful to signal to
- muxers such as mp4mux. The new field is parsed from/to `GstVideoInfo` of course.
-
-- video decoder and video encoder base classes try harder to proxy
- interlacing, colorimetry and chroma-site related fields in caps properly.
-
-- The buffer stored in the `PROTECTION` events is now left unchanged. This is a
- change of behaviour since 1.8, especially for the mssdemux element which used to
- decode the base64 parsed data wrapped in the protection events emitted by the
- demuxer.
-
-- `PROTECTION` events can now be injected into the pipeline from the application;
- source elements deriving from GstBaseSrc will forward those downstream now.
-
-- The DASH demuxer is now correctly parsing the MSPR-2.0 ContentProtection nodes
- and emits Protection events accordingly. Applications relying on those events
- might need to decode the base64 data stored in the event buffer before using it.
-
-- The registry can now also be disabled by setting the environment variable
- `GST_REGISTRY_DISABLE=yes`, with similar effect as the `GST_DISABLE_REGISTRY`
- compile time switch.
-
-- Seeking performance with gstreamer-vaapi based decoders was improved. It would
- recreate the decoder and surfaces on every seek which can be quite slow.
-
-- more robust handling of input caps changes in videoaggregator-based elements
- such as `compositor`.
-
-- Lots of adaptive streaming-related fixes across the board (DASH, MSS, HLS). Also:
-
- - `mssdemux`, the Microsoft Smooth Streaming demuxer, has seen various
- fixes for live streams, duration reporting and seeking.
-
- - The DASH manifest parser now extracts MS PlayReady ContentProtection objects
- from manifests and sends them downstream as `PROTECTION` events. It also
- supports multiple Period elements in external xml now.
-
-- gst-libav was updated to ffmpeg 3.3 but should still work with any 3.x
- version.
-
-- GstEncodingProfile has been generally enhanced so it can, for
- example, be used to get possible profiles for a given file
- extension. It is now possible to define profiles based on element
- factory names or using a path to a `.gep` file containing a
- serialized profile.
-
-- `audioconvert` can now do endianness conversion in-place. All other
- conversions still require a copy, but e.g. sign conversion and a few others
- could also be implemented in-place now.
-
-- The new, experimental `playbin3` and `urisourcebin` elements got many
- bugfixes and improvements and should generally be closer to a full
- replacement of the old elements.
-
-- `interleave` now supports > 64 channels.
-
-- OpenCV elements, `grabcut` and `retinex` has been ported to use
- `GstOpencvVideoFilter` base class, increasing code reuse and fixing buffer
- map/unmap issues. Redundant copie of images has been removed in `edgedetect`,
- `cvlaplace` and `cvsobel`. This comes with various cleanup and Meson support.
+- this section will be filled in shortly
### OpenGL integration
-- As usual the GStreamer OpenGL integration library has seen numerous
- fixes and performance improvements all over the place, and is hopefully
- ready now to become API stable and be moved to gst-plugins-base during the
- 1.14 release cycle.
-
-- The GStreamer OpenGL integration layer has also gained support for the
- Vivante EGL FB windowing system, which improves performance on platforms
- such as Freescale iMX.6 for those who are stuck with the proprietary driver.
- The `qmlglsink` element also supports this now if Qt is used with eglfs or
- wayland backend, and it works in conjunction with [gstreamer-imx][gstreamer-imx]
- of course.
-
-- various `qmlglsrc` improvements
-
-[gstreamer-imx]: https://github.com/Freescale/gstreamer-imx
+- this section will be filled in shortly
## Tracing framework and debugging improvements
-- New tracing hooks have been added to track GstMiniObject and GstObject
- ref/unref operations.
-
-- The memory leaks tracer can optionally use this to retrieve stack traces if
- enabled with e.g. `GST_TRACERS=leaks(filters="GstEvent,GstMessage",stack-traces-flags=full)`
-
-- The `GST_DEBUG_FILE` environment variable, which can be used to write the
- debug log output to a file instead of printing it to stderr, can now contain
- a name pattern, which is useful for automated testing and continuous
- integration systems. The following format specifiers are supported:
-
- - `%p`: will be replaced with the PID
- - `%r`: will be replaced with a random number, which is useful for instance
- when running two processes with the same PID but in different containers.
+- this section will be filled in shortly
## Tools
-- `gst-inspect-1.0` can now list elements by type with the new `--types`
- command-line option, e.g. `gst-inspect-1.0 --types=Audio/Encoder` will
- show a list of audio encoders.
-
-- `gst-launch-1.0` and `gst_parse_launch()` have gained a new operator (`:`)
- that allows linking all pads between two elements. This is useful in cases
- where the exact number of pads or type of pads is not known beforehand, such
- as in the `uridecodebin : encodebin` scenario, for example. In this case,
- multiple links will be created if the encodebin has multiple profiles
- compatible with the output of uridecodebin.
-
-- `gst-device-monitor-1.0` now shows a `gst-launch-1.0` snippet for each
- device that shows how to make use of it in a `gst-launch-1.0` pipeline string.
+- this section will be filled in shortly
## GStreamer RTSP server
-- The RTSP server now also supports Digest authentication in addition to Basic
- authentication.
-
-- The `GstRTSPClient` class has gained a `pre-*-request` signal and virtual
- method for each client request type, emitted in the beginning of each rtsp
- request. These signals or virtual methods let the application validate the
- requests, configure the media/stream in a certain way and also generate error
- status codes in case of an error or a bad request.
+- this section will be filled in shortly
## GStreamer VAAPI
-- GstVaapiDisplay now inherits from GstObject, thus the VA display logging
- messages are better and tracing the context sharing is more readable.
-
-- When uploading raw images into a VA surfaces now VADeriveImages are tried
- fist, improving the upload performance, if it is possible.
-
-- The decoders and the post-processor now can push dmabuf-based buffers to
- downstream under certain conditions. For example:
-
- `GST_GL_PLATFORM=egl gst-play-1.0 video-sample.mkv --videosink=glimagesink`
-
-- Refactored the wrapping of VA surface into gstreamer memory, adding lock
- when mapping and unmapping, and many other fixes.
-
-- Now `vaapidecodebin` loads `vaapipostproc` dynamically. It is possible to
- avoid it usage with the environment variable `GST_VAAPI_DISABLE_VPP=1`.
-
-- Regarding encoders: they have primary rank again, since they can discover,
- in run-time, the color formats they can use for upstream raw buffers and
- caps renegotiation is now possible. Also the encoders push encoding info
- downstream via tags.
-
-- About specific encoders: added constant bit-rate encoding mode for VP8 and
- H265 encoder handles P010_10LE color format.
-
-- Regarding decoders, flush operation has been improved, now the internal VA
- encoder is not recreated at each flush. Also there are several improvements
- in the handling of H264 and H265 streams.
-
-- VAAPI plugins try to create their on GstGL context (when available) if they
- cannot find it in the pipeline, to figure out what type of VA Display they
- should create.
-
-- Regarding `vaapisink` for X11, if the backend reports that it is unable to
- render correctly the current color format, an internal VA post-processor, is
- instantiated (if available) and converts the color format.
+- this section will be filled in shortly
## GStreamer Editing Services and NLE
-- Enhanced auto transition behaviour
-
-- Fix some races in `nlecomposition`
-
-- Allow building with msvc
-
-- Added a UNIX manpage for `ges-launch`
-
-- API changes:
- - Added ges_deinit (allowing the leak tracer to work properly)
- - Added ges_layer_get_clips_in_interval
- - Finally hide internal symbols that should never have been exposed
+- this section will be filled in shortly
## GStreamer validate
-- Port `gst-validate-launcher` to python 3
-
-- `gst-validate-launcher` now checks if blacklisted bugs have been fixed on
- bugzilla and errors out if it is the case
-
-- Allow building with msvc
-
-- Add ability for the launcher to run GStreamer unit tests
-
-- Added a way to activate the leaks tracer on our tests and fix leaks
-
-- Make the http server multithreaded
-
-- New testsuite for running various test scenarios on the DASH-IF test vectors
+- this section will be filled in shortly
## GStreamer Python Bindings
-- Overrides has been added for IntRange, Int64Range, DoubleRange,
- FractionRange, Array and List. This finally enables Python programmers
- to fully read and write GstCaps objects.
+- this section will be filled in shortly
## Build and Dependencies
-- Meson build files are now disted in tarballs, for jhbuild and so distro
- packagers can start using it. Note that the Meson-based build system is not
- 100% feature-equivalent with the autotools-based one yet.
-
-- Some plugin filenames have been changed to match the plugin names: for example
- the file name of the `encoding` plugin in gst-plugins-base containing the
- `encodebin` element was `libgstencodebin.so` and has been changed to
- `libgstencoding.so`. This affects only a handful of plugins across modules.
-
- **Developers who install GStreamer from source and just do `make install`**
- **after updating the source code, without doing `make uninstall` first, will**
- **have to manually remove the old installed plugin files from the installation**
- **prefix, or they will get 'Cannot register existing type' critical warnings.**
-
-- Most of the docbook-based documentation (FAQ, Application Development Manual,
- Plugin Writer's Guide, design documents) has been converted to markdown and
- moved into a new gst-docs module. The gtk-doc library API references and
- the plugins documentation are still built as part of the source modules though.
-
-- GStreamer core now optionally uses libunwind and libdw to generate backtraces.
- This is useful for tracer plugins used during debugging and development.
-
-- There is a new `libgstbadallocators-1.0` library in gst-plugins-bad (which
- may go away again in future releases once the `GstPhysMemoryAllocator`
- interface API has been validated by more users).
-
-- `gst-omx` and `gstreamer-vaapi` modules can now also be built using the
- Meson build system.
-
-- The `qtkitvideosrc` element for macOS was removed. The API is deprecated
- since 10.9 and it wasn't shipped in the binaries since a few releases.
+- this section will be filled in shortly
## Platform-specific improvements
### Android
-- androidmedia: add support for VP9 video decoding/encoding and Opus audio
- decoding (where supported)
+- this section will be filled in shortly
-### OS/X and iOS
+### macOS and iOS
-- `avfvideosrc`, which represents an iPhone camera or, on a Mac, a screencapture
- session, so far allowed you to select an input device by device index only.
- New API adds the ability to select the position (front or back facing) and
- device-type (wide angle, telephoto, etc.). Furthermore, you can now also
- specify the orientation (portrait, landscape, etc.) of the videostream.
+- this section will be filled in shortly
### Windows
-- `dx9screencapsrc` can now optionally also capture the cursor.
+- this section will be filled in shortly
## Contributors
-Aleix Conchillo Flaque, Alejandro G. Castro, Aleksandr Slobodeniuk, Alexandru
-Băluț, Alex Ashley, Andre McCurdy, Andrew, Anton Eliasson, Antonio Ospite,
-Arnaud Vrac, Arun Raghavan, Aurélien Zanelli, Axel Menzel, Benjamin Otte,
-Branko Subasic, Brendan Shanks, Carl Karsten, Carlos Rafael Giani, ChangBok
-Chae, Chris Bass, Christian Schaller, christophecvr, Claudio Saavedra,
-Corentin Noël, Dag Gullberg, Daniel Garbanzo, Daniel Shahaf, David Evans,
-David Schleef, David Warman, Dominique Leuenberger, Dongil Park, Douglas
-Bagnall, Edgard Lima, Edward Hervey, Emeric Grange, Enrico Jorns, Enrique
-Ocaña González, Evan Nemerson, Fabian Orccon, Fabien Dessenne, Fabrice Bellet,
-Florent Thiéry, Florian Zwoch, Francisco Velazquez, Frédéric Dalleau, Garima
-Gaur, Gaurav Gupta, George Kiagiadakis, Georg Lippitsch, Göran Jönsson, Graham
-Leggett, Guillaume Desmottes, Gurkirpal Singh, Haihua Hu, Hanno Boeck, Havard
-Graff, Heekyoung Seo, hoonhee.lee, Hyunjun Ko, Imre Eörs, Iñaki García
-Etxebarria, Jagadish, Jagyum Koo, Jan Alexander Steffens (heftig), Jan
-Schmidt, Jean-Christophe Trotin, Jochen Henneberg, Jonas Holmberg, Joris
-Valette, Josep Torra, Juan Pablo Ugarte, Julien Isorce, Jürgen Sachs, Koop
-Mast, Kseniia Vasilchuk, Lars Wendler, leigh123linux@googlemail.com, Luis de
-Bethencourt, Lyon Wang, Marcin Kolny, Marinus Schraal, Mark Nauwelaerts,
-Mathieu Duponchelle, Matthew Waters, Matt Staples, Michael Dutka, Michael
-Olbrich, Michael Smith, Michael Tretter, Miguel París Díaz, namanyadav12, Neha
-Arora, Nick Kallen, Nicola Murino, Nicolas Dechesne, Nicolas Dufresne, Nicolas
-Huet, Nirbheek Chauhan, Ole André Vadla Ravnås, Olivier Crête, Patricia
-Muscalu, Peter Korsgaard, Peter Seiderer, Petr Kulhavy, Philippe Normand,
-Philippe Renon, Philipp Zabel, Rahul Bedarkar, Reynaldo H. Verdejo Pinochet,
-Ricardo Ribalda Delgado, Rico Tzschichholz, Руслан Ижбулатов, Samuel Maroy,
-Santiago Carot-Nemesio, Scott D Phillips, Sean DuBois, Sebastian Dröge, Sergey
-Borovkov, Seungha Yang, shakin chou, Song Bing, Søren Juul, Sreerenj
-Balachandran, Stefan Kost, Stefan Sauer, Stepan Salenikovich, Stian Selnes,
-Stuart Weaver, suhas2go, Thiago Santos, Thibault Saunier, Thomas Bluemel,
-Thomas Petazzoni, Tim-Philipp Müller, Ting-Wei Lan, Tobias Mueller, Todor
-Tomov, Tomasz Zajac, Ulf Olsson, Ursula Maplehurst, Víctor Manuel Jáquez Leal,
-Victor Toso, Vincent Penquerc'h, Vineeth TM, Vinod Kesti, Vitor Massaru Iha,
-Vivia Nikolaidou, WeiChungChang, William Manley, Wim Taymans, Wojciech
-Przybyl, Wonchul Lee, Xavier Claessens, Yasushi SHOJI
+- this section will be filled in shortly
... and many others who have contributed bug reports, translations, sent
suggestions or helped testing.
-## Bugs fixed in 1.12
+## Bugs fixed in 1.14
-More than [635 bugs][bugs-fixed-in-1.12] have been fixed during
-the development of 1.12.
+- this section will be filled in shortly
+
+More than [704 bugs][bugs-fixed-in-1.14] have been fixed during
+the development of 1.14.
This list does not include issues that have been cherry-picked into the
-stable 1.10 branch and fixed there as well, all fixes that ended up in the
-1.10 branch are also included in 1.12.
+stable 1.12 branch and fixed there as well, all fixes that ended up in the
+1.12 branch are also included in 1.14.
This list also does not include issues that have been fixed without a bug
report in bugzilla, so the actual number of fixes is much higher.
-[bugs-fixed-in-1.12]: https://bugzilla.gnome.org/buglist.cgi?bug_status=RESOLVED&bug_status=VERIFIED&classification=Platform&limit=0&list_id=213265&order=bug_id&product=GStreamer&query_format=advanced&resolution=FIXED&target_milestone=1.10.1&target_milestone=1.10.2&target_milestone=1.10.3&target_milestone=1.10.4&target_milestone=1.11.1&target_milestone=1.11.2&target_milestone=1.11.3&target_milestone=1.11.4&target_milestone=1.11.90&target_milestone=1.11.91&target_milestone=1.12.0
+[bugs-fixed-in-1.14]: https://bugzilla.gnome.org/buglist.cgi?bug_status=RESOLVED&bug_status=VERIFIED&classification=Platform&limit=0&list_id=213265&order=bug_id&product=GStreamer&query_format=advanced&resolution=FIXED&target_milestone=1.12.1&target_milestone=1.12.2&target_milestone=1.12.3&target_milestone=1.12.4&target_milestone=1.13.1&target_milestone=1.13.2&target_milestone=1.13.3&target_milestone=1.13.4&target_milestone=1.13.90&target_milestone=1.13.91&target_milestone=1.14.0
-## Stable 1.12 branch
+## Stable 1.14 branch
-After the 1.12.0 release there will be several 1.12.x bug-fix releases which
+After the 1.14.0 release there will be several 1.14.x bug-fix releases which
will contain bug fixes which have been deemed suitable for a stable branch,
but no new features or intrusive changes will be added to a bug-fix release
-usually. The 1.12.x bug-fix releases will be made from the git 1.12 branch, which
-is a stable branch.
+usually. The 1.14.x bug-fix releases will be made from the git 1.14 branch,
+which is a stable branch.
-### 1.12.0
+### 1.14.0
-1.12.0 was released on 4th May 2017.
-
-<a name="1.12.1"></a>
-
-### 1.12.1
-
-The first 1.12 bug-fix release (1.12.1) was released on 20 June 2017.
-This release only contains bugfixes and it should be safe to update from 1.12.x.
-
-#### Major bugfixes in 1.12.1
-
- - Various fixes for crashes, assertions, deadlocks and memory leaks
- - Fix for regression when seeking to the end of ASF files
- - Fix for regression in (raw)videoparse that caused it to omit video metadata
- - Fix for regression in discoverer that made it show more streams than
- actually available
- - Numerous bugfixes to the adaptive demuxer base class and the DASH demuxer
- - Various playbin3/urisourcebin related bugfixes
- - Vivante DirectVIV (imx6) texture uploader works with single-plane (e.g.
- RGB) video formats now
- - Intel Media SDK encoder now outputs valid PTS and keyframe flags
- - OpenJPEG2000 plugin can be loaded again on MacOS and correctly displays
- 8 bit RGB images now
- - Fixes to DirectSound source/sink for high CPU usage and wrong
- latency/buffer size calculations
- - gst-libav was updated to ffmpeg n3.3.2
- - ... and many, many more!
-
-For a full list of bugfixes see [Bugzilla][buglist-1.12.1]. Note that this is
-not the full list of changes. For the full list of changes please refer to the
-GIT logs or ChangeLogs of the particular modules.
-
-[buglist-1.12.1]: https://bugzilla.gnome.org/buglist.cgi?bug_status=RESOLVED&bug_status=VERIFIED&classification=Platform&limit=0&list_id=225693&order=bug_id&product=GStreamer&query_format=advanced&resolution=FIXED&target_milestone=1.12.1
-
-<a name="1.12.2"></a>
-
-### 1.12.2
-
-The second 1.12 bug-fix release (1.12.2) was released on 14 July 2017.
-This release only contains bugfixes and it should be safe to update from 1.12.x.
-
-#### Major bugfixes in 1.12.2
-
- - Various fixes for crashes, assertions, deadlocks and memory leaks
- - Regression fix for playback of live HLS streams
- - Regression fix for crash when playing back a tunneled RTSP stream
- - Regression fix for playback of RLE animations in MOV containers
- - Regression fix for RTP GSM payloading producing corrupted output
- - Major bugfixes to the MXF demuxer, mostly related to seeking and
- fixes to the frame reordering handling in the MXF muxer and demuxer
- - Fix for playback of mono streams on MacOS
- - More fixes for index handling of ASF containers
- - Various fixes to adaptivedemux, DASH and HLS demuxers
- - Fix deadlock in gstreamer-editing-services during class initialization
- - ... and many, many more!
-
-For a full list of bugfixes see [Bugzilla][buglist-1.12.2]. Note that this is
-not the full list of changes. For the full list of changes please refer to the
-GIT logs or ChangeLogs of the particular modules.
-
-[buglist-1.12.2]: https://bugzilla.gnome.org/buglist.cgi?bug_status=RESOLVED&bug_status=VERIFIED&classification=Platform&limit=0&list_id=225693&order=bug_id&product=GStreamer&query_format=advanced&resolution=FIXED&target_milestone=1.12.2
-
-<a name="1.12.3"></a>
-
-### 1.12.3
-
-The third 1.12 bug-fix release (1.12.3) was released on 18 September 2017.
-This release only contains bugfixes and it should be safe to update from 1.12.x.
-
-#### Major bugfixes in 1.12.3
-
- - Fix for infinite recursion on buffer free in v4l2
- - Fix for glimagesink crash on macOS when used via autovideosink
- - Fix for huge overhead in matroskamux caused by writing one Cluster per
- audio-frame in audio-only streams. Also use SimpleBlocks for Opus and other
- audio codecs, which works around a bug in VLC that prevented Opus streams
- to be played and decreases overhead even more
- - Fix for flushing seeks in rtpmsrc always causing an error
- - Fix for timestamp overflows in calculations in audio encoder base class
- - Fix for RTP h265 depayloader marking P-frames as I-frames
- - Fix for long connection delays of clients in RTSP server
- - Fixes for event handling in queue and queue2 elements, and updates to
- buffering levels on NOT_LINKED streams
- - Various fixes to event and buffering handling in decodebin3/playbin3
- - Various fixes for memory leaks, deadlocks and crashes in all modules
- - ... and many, many more!
-
-For a full list of bugfixes see [Bugzilla][buglist-1.12.3]. Note that this is
-not the full list of changes. For the full list of changes please refer to the
-GIT logs or ChangeLogs of the particular modules.
-
-[buglist-1.12.3]: https://bugzilla.gnome.org/buglist.cgi?bug_status=RESOLVED&bug_status=VERIFIED&classification=Platform&limit=0&list_id=248880&order=bug_id&product=GStreamer&query_format=advanced&resolution=FIXED&target_milestone=1.12.3
-
-### 1.12.4
-
-The fourth 1.12 bug-fix release (1.12.4) was released on 7 December 2017.
-This release only contains bugfixes and it should be safe to update from 1.12.x.
-
-#### Major bugfixes in 1.12.4
-
- - Dozens of fixes for various issues detected with the help of Google's OSS-Fuzz
- project: https://github.com/google/oss-fuzz
- Details to be found there in the bug tracker
- - Performance regressions with registering debug categories after gst_init()
- were fixed
- - Regression with seeking back to 0 in souphttpsrc was fixed
- - Regression with header rewriting in flacparse was fixed
- - Regression with playbin/playsink leaking sinks was fixed
- - Inconsistencies with DROPPED/HANDLED handling in pad probe handlers are fixed
- - gst_bin_iterate_sorted() always returns sources last now, as documented
- - gst_query_writable_structure() will never return NULL, for consistency with events
- - Removal of metas from gst_buffer_meta_foreach() works correctly now
- - OpenJPEG plugin builds with OpenJPEG >= 2.3
- - CDIO plugin builds with CDIO >= 1.0
- - gstreamer-vaapi works correctly with libva 1.0
- - gst-libav was updated to ffmpeg 3.3.5
- - Various fixes for memory leaks, deadlocks and crashes in all modules
- - ... and many, many more!
-
-For a full list of bugfixes see [Bugzilla][buglist-1.12.4]. Note that this is
-not the full list of changes. For the full list of changes please refer to the
-GIT logs or ChangeLogs of the particular modules.
-
-[buglist-1.12.4]: https://bugzilla.gnome.org/buglist.cgi?bug_status=RESOLVED&bug_status=VERIFIED&classification=Platform&limit=0&list_id=270310&order=bug_id&product=GStreamer&query_format=advanced&resolution=FIXED&target_milestone=1.12.4
+1.14.0 is scheduled to be released in late February / early March 2018.
## Known Issues
@@ -849,24 +153,22 @@
[bug-770264]: https://bugzilla.gnome.org/show_bug.cgi?id=770264
-## Schedule for 1.14
+## Schedule for 1.16
-Our next major feature release will be 1.14, and 1.13 will be the unstable
-development version leading up to the stable 1.14 release. The development
-of 1.13/1.14 will happen in the git master branch.
+Our next major feature release will be 1.16, and 1.15 will be the unstable
+development version leading up to the stable 1.16 release. The development
+of 1.15/1.16 will happen in the git master branch.
-The plan for the 1.14 development cycle is yet to be confirmed, but it is
-expected that feature freeze will be around early December 2017
-followed by several 1.13 pre-releases and the new 1.14 stable release
-in late December or some time in January.
+The plan for the 1.16 development cycle is yet to be confirmed, but it is
+expected that feature freeze will be around August 2017
+followed by several 1.15 pre-releases and the new 1.16 stable release
+in September.
-1.14 will be backwards-compatible to the stable 1.12, 1.10, 1.8, 1.6, 1.4,
+1.16 will be backwards-compatible to the stable 1.14, 1.12, 1.10, 1.8, 1.6, 1.4,
1.2 and 1.0 release series.
- - -
-*These release notes have been prepared by Olivier Crête, Sebastian Dröge,
-Nicolas Dufresne, Víctor Manuel Jáquez Leal, Tim-Philipp Müller, Philippe
-Normand and Thibault Saunier.*
+*These release notes have been prepared by Tim-Philipp Müller.*
*License: [CC BY-SA 4.0](http://creativecommons.org/licenses/by-sa/4.0/)*
diff --git a/README b/README
index 9d62895..cf32843 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-GStreamer 1.12.x stable series
+GStreamer 1.13.x development series
WHAT IT IS
----------
diff --git a/RELEASE b/RELEASE
index 458be3c..81be6c4 100644
--- a/RELEASE
+++ b/RELEASE
@@ -1,15 +1,16 @@
-Release notes for GStreamer Ugly Plugins 1.12.4
+Release notes for GStreamer Ugly Plugins 1.12.0
-The GStreamer team is proud to announce the fourth bugfix release in the stable
-1.12 release series of your favourite cross-platform multimedia framework!
+The GStreamer team is pleased to announce the first release in the stable 1.12
+release series. The 1.12 release series is adding new features on top of the
+1.0, 1.2, 1.4, 1.6, 1.8 and 1.10 series and is part of the API and ABI-stable
+1.x release series of the GStreamer multimedia framework.
-This release only contains bugfixes and it is safe to update from 1.12.x. For a
-full list of bugfixes see Bugzilla.
+Full release notes can be found here
-See /releases/1.12/ for the full release notes.
+Binaries for Android, iOS, Mac OS X and Windows will be provided in the next days.
"When you have to shoot, shoot. Don't talk."
@@ -55,10 +56,6 @@
-Bugs fixed in this release
-
- * 791301 : cdio: Fails to build with cdio 1.0
-
==== Download ====
You can find source releases of gst-plugins-ugly in the download
@@ -94,8 +91,5 @@
Contributors to this release
- * Deepak Srivastava
- * Ponnam Srinivas
- * Satya Prakash Gupta
* Sebastian Dröge
\ No newline at end of file
diff --git a/REQUIREMENTS b/REQUIREMENTS
index a5dae28..cb0cfbd 100644
--- a/REQUIREMENTS
+++ b/REQUIREMENTS
@@ -9,7 +9,7 @@
===============
An extra set of tools is required if you wish to build GStreamer out of
-CVS (using autogen.sh):
+git (using autogen.sh):
autoconf 2.52 or better
automake 1.5
@@ -34,10 +34,6 @@
http://liba52.sourceforge.net/
opencore-amr (for the AMR-NB decoder and encoder and the AMR-WB decoder)
http://sourceforge.net/projects/opencore-amr/
-libmpg123 (for the mpg123 mp3 decoder plugin)
- https://www.mpg123.de/api/
-liblame (for lame mp3 encoder)
- http://www.mp3dev.org/mp3/
libdvdread (for the dvdreadsrc)
http://www.dtek.chalmers.se/groups/dvd/
(optional: libcss for encrypted DVDs)
@@ -49,6 +45,4 @@
http://savannah.gnu.org/projects/libcdio/
x264 (for the x264enc H.264 encoder)
http://www.videolan.org/developers/x264.html
-twolame (for the twolame mp2 encoder)
- http://www.twolame.org/
sidplay FIXME
diff --git a/common/Makefile.in b/common/Makefile.in
index 35ab68b..aaa9931 100644
--- a/common/Makefile.in
+++ b/common/Makefile.in
@@ -258,6 +258,7 @@
ERROR_CFLAGS = @ERROR_CFLAGS@
ERROR_CXXFLAGS = @ERROR_CXXFLAGS@
EXEEXT = @EXEEXT@
+EXTRA_CFLAGS = @EXTRA_CFLAGS@
FFLAGS = @FFLAGS@
FGREP = @FGREP@
GCOV = @GCOV@
@@ -309,7 +310,6 @@
GST_PLUGINS_NONPORTED = @GST_PLUGINS_NONPORTED@
GST_PLUGINS_SELECTED = @GST_PLUGINS_SELECTED@
GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
-GST_PLUGIN_LIBTOOLFLAGS = @GST_PLUGIN_LIBTOOLFLAGS@
GST_PREFIX = @GST_PREFIX@
GST_REVISION = @GST_REVISION@
GST_TOOLS_DIR = @GST_TOOLS_DIR@
@@ -320,7 +320,6 @@
GTKDOC_REBASE = @GTKDOC_REBASE@
HAVE_CXX = @HAVE_CXX@
HAVE_DVDREAD = @HAVE_DVDREAD@
-HAVE_LAME = @HAVE_LAME@
HTML_DIR = @HTML_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
@@ -329,8 +328,6 @@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INTLLIBS = @INTLLIBS@
INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-LAME_CFLAGS = @LAME_CFLAGS@
-LAME_LIBS = @LAME_LIBS@
LD = @LD@
LDFLAGS = @LDFLAGS@
LIBICONV = @LIBICONV@
@@ -352,8 +349,6 @@
MKDIR_P = @MKDIR_P@
MPEG2DEC_CFLAGS = @MPEG2DEC_CFLAGS@
MPEG2DEC_LIBS = @MPEG2DEC_LIBS@
-MPG123_CFLAGS = @MPG123_CFLAGS@
-MPG123_LIBS = @MPG123_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_015 = @MSGFMT_015@
MSGMERGE = @MSGMERGE@
@@ -396,13 +391,13 @@
SIDPLAY_CFLAGS = @SIDPLAY_CFLAGS@
SIDPLAY_LIBS = @SIDPLAY_LIBS@
STRIP = @STRIP@
-TWOLAME_CFLAGS = @TWOLAME_CFLAGS@
-TWOLAME_LIBS = @TWOLAME_LIBS@
USE_NLS = @USE_NLS@
VALGRIND_CFLAGS = @VALGRIND_CFLAGS@
VALGRIND_LIBS = @VALGRIND_LIBS@
VALGRIND_PATH = @VALGRIND_PATH@
VERSION = @VERSION@
+VISIBILITY_CFLAGS = @VISIBILITY_CFLAGS@
+VISIBILITY_CXXFLAGS = @VISIBILITY_CXXFLAGS@
WARNING_CFLAGS = @WARNING_CFLAGS@
WARNING_CXXFLAGS = @WARNING_CXXFLAGS@
WIN32_LIBS = @WIN32_LIBS@
diff --git a/common/check.mak b/common/check.mak
index 66497ff..9336c44 100644
--- a/common/check.mak
+++ b/common/check.mak
@@ -94,7 +94,11 @@
@$(AM_TESTS_ENVIRONMENT) \
CK_FORK=no \
$(LIBTOOL) --mode=execute \
- gdb $*
+ gdb $(GDB_ARGS) $*
+
+%.gdb-forever: %
+ @while $(MAKE) GDB_ARGS="-ex run -ex quit" $*.gdb ; do \
+ sleep 1; done
%.lcov-reset:
$(MAKE) $*.lcov-run
diff --git a/common/gstdoc-scangobj b/common/gstdoc-scangobj
index 2e84775..9d9fee4 100755
--- a/common/gstdoc-scangobj
+++ b/common/gstdoc-scangobj
@@ -295,6 +295,7 @@
g_warning ("Could not load plugin feature %s",
gst_plugin_feature_get_name (feature));
}
+ factories = g_list_prepend (factories, feature);
if (GST_IS_ELEMENT_FACTORY (feature)) {
const gchar *pad_dir[] = { "unknown","source","sink" };
@@ -304,7 +305,6 @@
$debug_log (" feature: %s", gst_plugin_feature_get_name (feature));
factory = GST_ELEMENT_FACTORY (feature);
- factories = g_list_prepend (factories, factory);
if (reinspect) {
/* output element data */
@@ -332,6 +332,16 @@
g_list_free (pads);
fputs (" </pads>\\n </element>\\n", inspect);
}
+ } else if (GST_IS_TRACER_FACTORY (feature)) {
+ $debug_log (" feature: %s", gst_plugin_feature_get_name (feature));
+
+ if (reinspect) {
+ /* output element data */
+ fputs (" <tracer>\\n", inspect);
+ fputs (xmlprint(6, "name", gst_plugin_feature_get_name (feature)),inspect);
+
+ fputs (" </tracer>\\n", inspect);
+ }
}
features = g_list_next (features);
}
@@ -354,14 +364,22 @@
/* fill it */
while (l) {
- factory = GST_ELEMENT_FACTORY (l->data);
- type = gst_element_factory_get_element_type (factory);
+ const gchar *name = NULL;
+ type = 0;
+ if (GST_IS_ELEMENT_FACTORY (l->data)) {
+ factory = GST_ELEMENT_FACTORY (l->data);
+ type = gst_element_factory_get_element_type (factory);
+ name = gst_element_factory_get_metadata (factory, GST_ELEMENT_METADATA_LONGNAME);
+ } else if (GST_IS_TRACER_FACTORY (l->data)) {
+ GstTracerFactory *t = GST_TRACER_FACTORY (l->data);
+ type = gst_tracer_factory_get_tracer_type (t);
+ name = gst_plugin_feature_get_name (GST_PLUGIN_FEATURE (t));
+ }
if (type != 0) {
- $debug_log ("adding type for factory %s", gst_element_factory_get_metadata (factory, GST_ELEMENT_METADATA_LONGNAME));
+ $debug_log ("adding type for factory %s", name);
object_types[i++] = type;
} else {
- g_message ("type info for factory %s not found",
- gst_element_factory_get_metadata (factory, GST_ELEMENT_METADATA_LONGNAME));
+ g_message ("type info for factory %s not found", name);
}
l = g_list_next (l);
}
diff --git a/common/m4/Makefile.in b/common/m4/Makefile.in
index 66b1eba..6c2132e 100644
--- a/common/m4/Makefile.in
+++ b/common/m4/Makefile.in
@@ -198,6 +198,7 @@
ERROR_CFLAGS = @ERROR_CFLAGS@
ERROR_CXXFLAGS = @ERROR_CXXFLAGS@
EXEEXT = @EXEEXT@
+EXTRA_CFLAGS = @EXTRA_CFLAGS@
FFLAGS = @FFLAGS@
FGREP = @FGREP@
GCOV = @GCOV@
@@ -249,7 +250,6 @@
GST_PLUGINS_NONPORTED = @GST_PLUGINS_NONPORTED@
GST_PLUGINS_SELECTED = @GST_PLUGINS_SELECTED@
GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
-GST_PLUGIN_LIBTOOLFLAGS = @GST_PLUGIN_LIBTOOLFLAGS@
GST_PREFIX = @GST_PREFIX@
GST_REVISION = @GST_REVISION@
GST_TOOLS_DIR = @GST_TOOLS_DIR@
@@ -260,7 +260,6 @@
GTKDOC_REBASE = @GTKDOC_REBASE@
HAVE_CXX = @HAVE_CXX@
HAVE_DVDREAD = @HAVE_DVDREAD@
-HAVE_LAME = @HAVE_LAME@
HTML_DIR = @HTML_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
@@ -269,8 +268,6 @@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INTLLIBS = @INTLLIBS@
INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-LAME_CFLAGS = @LAME_CFLAGS@
-LAME_LIBS = @LAME_LIBS@
LD = @LD@
LDFLAGS = @LDFLAGS@
LIBICONV = @LIBICONV@
@@ -292,8 +289,6 @@
MKDIR_P = @MKDIR_P@
MPEG2DEC_CFLAGS = @MPEG2DEC_CFLAGS@
MPEG2DEC_LIBS = @MPEG2DEC_LIBS@
-MPG123_CFLAGS = @MPG123_CFLAGS@
-MPG123_LIBS = @MPG123_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_015 = @MSGFMT_015@
MSGMERGE = @MSGMERGE@
@@ -336,13 +331,13 @@
SIDPLAY_CFLAGS = @SIDPLAY_CFLAGS@
SIDPLAY_LIBS = @SIDPLAY_LIBS@
STRIP = @STRIP@
-TWOLAME_CFLAGS = @TWOLAME_CFLAGS@
-TWOLAME_LIBS = @TWOLAME_LIBS@
USE_NLS = @USE_NLS@
VALGRIND_CFLAGS = @VALGRIND_CFLAGS@
VALGRIND_LIBS = @VALGRIND_LIBS@
VALGRIND_PATH = @VALGRIND_PATH@
VERSION = @VERSION@
+VISIBILITY_CFLAGS = @VISIBILITY_CFLAGS@
+VISIBILITY_CXXFLAGS = @VISIBILITY_CXXFLAGS@
WARNING_CFLAGS = @WARNING_CFLAGS@
WARNING_CXXFLAGS = @WARNING_CXXFLAGS@
WIN32_LIBS = @WIN32_LIBS@
diff --git a/common/plugins.xsl b/common/plugins.xsl
index 60515b6..2c50203 100644
--- a/common/plugins.xsl
+++ b/common/plugins.xsl
@@ -111,6 +111,45 @@
</exsl:document>
</xsl:template>
+ <xsl:template match="tracer">
+ <xsl:element name="varlistentry">
+ <xsl:element name="term">
+ <xsl:element name="link">
+ <xsl:attribute name="linkend"><xsl:value-of select="$module" />-plugins-<xsl:value-of select="name"/>tracer</xsl:attribute>
+ <xsl:value-of select="name" />
+ </xsl:element>
+ </xsl:element>
+ <!--<xsl:element name="listitem">
+ <xsl:element name="simpara"><xsl:value-of select="description" /></xsl:element>
+ </xsl:element>-->
+ </xsl:element>
+ <xsl:variable name="name"><xsl:copy-of select="name"/></xsl:variable>
+ <exsl:document href="{concat ('xml/tracer-', $name, '-details.xml')}" method="xml" indent="yes">
+
+ <xsl:element name="refsynopsisdiv">
+ <xsl:element name="refsect2">
+ <xsl:element name="title">Tracer Information</xsl:element>
+ <xsl:element name="variablelist">
+
+ <!-- plugin name and link -->
+ <xsl:element name="varlistentry">
+ <xsl:element name="term">plugin</xsl:element>
+ <xsl:element name="listitem">
+ <xsl:element name="simpara">
+ <xsl:element name="link">
+ <xsl:attribute name="linkend">plugin-<xsl:value-of select="../../name"/></xsl:attribute>
+ <xsl:value-of select="../../name" />
+ </xsl:element>
+ </xsl:element>
+ </xsl:element>
+ </xsl:element>
+ </xsl:element> <!-- variablelist -->
+ </xsl:element> <!-- refsect2 -->
+ </xsl:element> <!-- refsynopsisdiv -->
+
+ </exsl:document>
+ </xsl:template>
+
<xsl:template match="plugin">
<xsl:element name="refentry">
<xsl:attribute name="id"><xsl:value-of select="$module" />-plugins-plugin-<xsl:value-of select="name"/></xsl:attribute>
diff --git a/config.guess b/config.guess
index 2e9ad7f..31e01ef 100755
--- a/config.guess
+++ b/config.guess
@@ -1,8 +1,8 @@
#! /bin/sh
# Attempt to guess a canonical system name.
-# Copyright 1992-2016 Free Software Foundation, Inc.
+# Copyright 1992-2017 Free Software Foundation, Inc.
-timestamp='2016-10-02'
+timestamp='2017-11-07'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -15,7 +15,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, see <http://www.gnu.org/licenses/>.
+# along with this program; if not, see <https://www.gnu.org/licenses/>.
#
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -27,7 +27,7 @@
# Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
#
# You can get the latest version of this script from:
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
+# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
#
# Please send patches to <config-patches@gnu.org>.
@@ -39,7 +39,7 @@
Output the configuration name of the system \`$me' is run on.
-Operation modes:
+Options:
-h, --help print this help, then exit
-t, --time-stamp print date of last modification, then exit
-v, --version print version number, then exit
@@ -50,7 +50,7 @@
GNU config.guess ($timestamp)
Originally written by Per Bothner.
-Copyright 1992-2016 Free Software Foundation, Inc.
+Copyright 1992-2017 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -244,6 +244,9 @@
UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'`
echo ${UNAME_MACHINE_ARCH}-unknown-libertybsd${UNAME_RELEASE}
exit ;;
+ *:MidnightBSD:*:*)
+ echo ${UNAME_MACHINE}-unknown-midnightbsd${UNAME_RELEASE}
+ exit ;;
*:ekkoBSD:*:*)
echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
exit ;;
@@ -259,6 +262,9 @@
*:Sortix:*:*)
echo ${UNAME_MACHINE}-unknown-sortix
exit ;;
+ *:Redox:*:*)
+ echo ${UNAME_MACHINE}-unknown-redox
+ exit ;;
alpha:OSF1:*:*)
case $UNAME_RELEASE in
*4.0)
@@ -315,15 +321,6 @@
exitcode=$?
trap '' 0
exit $exitcode ;;
- Alpha\ *:Windows_NT*:*)
- # How do we know it's Interix rather than the generic POSIX subsystem?
- # Should we change UNAME_MACHINE based on the output of uname instead
- # of the specific Alpha model?
- echo alpha-pc-interix
- exit ;;
- 21064:Windows_NT:50:3)
- echo alpha-dec-winnt3.5
- exit ;;
Amiga*:UNIX_System_V:4.0:*)
echo m68k-unknown-sysv4
exit ;;
@@ -485,13 +482,13 @@
#endif
#if defined (host_mips) && defined (MIPSEB)
#if defined (SYSTYPE_SYSV)
- printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
+ printf ("mips-mips-riscos%ssysv\\n", argv[1]); exit (0);
#endif
#if defined (SYSTYPE_SVR4)
- printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
+ printf ("mips-mips-riscos%ssvr4\\n", argv[1]); exit (0);
#endif
#if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
- printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
+ printf ("mips-mips-riscos%sbsd\\n", argv[1]); exit (0);
#endif
#endif
exit (-1);
@@ -614,7 +611,7 @@
*:AIX:*:*)
echo rs6000-ibm-aix
exit ;;
- ibmrt:4.4BSD:*|romp-ibm:BSD:*)
+ ibmrt:4.4BSD:*|romp-ibm:4.4BSD:*)
echo romp-ibm-bsd4.4
exit ;;
ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and
@@ -635,8 +632,8 @@
9000/[34678]??:HP-UX:*:*)
HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
case "${UNAME_MACHINE}" in
- 9000/31? ) HP_ARCH=m68000 ;;
- 9000/[34]?? ) HP_ARCH=m68k ;;
+ 9000/31?) HP_ARCH=m68000 ;;
+ 9000/[34]??) HP_ARCH=m68k ;;
9000/[678][0-9][0-9])
if [ -x /usr/bin/getconf ]; then
sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
@@ -749,7 +746,7 @@
{ echo "$SYSTEM_NAME"; exit; }
echo unknown-hitachi-hiuxwe2
exit ;;
- 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
+ 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:*)
echo hppa1.1-hp-bsd
exit ;;
9000/8??:4.3bsd:*:*)
@@ -758,7 +755,7 @@
*9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
echo hppa1.0-hp-mpeix
exit ;;
- hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
+ hp7??:OSF1:*:* | hp8?[79]:OSF1:*:*)
echo hppa1.1-hp-osf
exit ;;
hp8??:OSF1:*:*)
@@ -837,10 +834,11 @@
UNAME_PROCESSOR=`/usr/bin/uname -p`
case ${UNAME_PROCESSOR} in
amd64)
- echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
- *)
- echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+ UNAME_PROCESSOR=x86_64 ;;
+ i386)
+ UNAME_PROCESSOR=i586 ;;
esac
+ echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
exit ;;
i*:CYGWIN*:*)
echo ${UNAME_MACHINE}-pc-cygwin
@@ -854,10 +852,6 @@
*:MSYS*:*)
echo ${UNAME_MACHINE}-pc-msys
exit ;;
- i*:windows32*:*)
- # uname -m includes "-pc" on this system.
- echo ${UNAME_MACHINE}-mingw32
- exit ;;
i*:PW*:*)
echo ${UNAME_MACHINE}-pc-pw32
exit ;;
@@ -873,27 +867,12 @@
echo ia64-unknown-interix${UNAME_RELEASE}
exit ;;
esac ;;
- [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
- echo i${UNAME_MACHINE}-pc-mks
- exit ;;
- 8664:Windows_NT:*)
- echo x86_64-pc-mks
- exit ;;
- i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
- # How do we know it's Interix rather than the generic POSIX subsystem?
- # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
- # UNAME_MACHINE based on the output of uname instead of i386?
- echo i586-pc-interix
- exit ;;
i*:UWIN*:*)
echo ${UNAME_MACHINE}-pc-uwin
exit ;;
amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
echo x86_64-unknown-cygwin
exit ;;
- p*:CYGWIN*:*)
- echo powerpcle-unknown-cygwin
- exit ;;
prep*:SunOS:5.*:*)
echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit ;;
@@ -1096,7 +1075,7 @@
i*86:*DOS:*:*)
echo ${UNAME_MACHINE}-pc-msdosdjgpp
exit ;;
- i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
+ i*86:*:4.*:*)
UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
@@ -1303,14 +1282,21 @@
if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then
if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
- (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
- grep IS_64BIT_ARCH >/dev/null
+ (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
+ grep IS_64BIT_ARCH >/dev/null
then
case $UNAME_PROCESSOR in
i386) UNAME_PROCESSOR=x86_64 ;;
powerpc) UNAME_PROCESSOR=powerpc64 ;;
esac
fi
+ # On 10.4-10.6 one might compile for PowerPC via gcc -arch ppc
+ if (echo '#ifdef __POWERPC__'; echo IS_PPC; echo '#endif') | \
+ (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
+ grep IS_PPC >/dev/null
+ then
+ UNAME_PROCESSOR=powerpc
+ fi
fi
elif test "$UNAME_PROCESSOR" = i386 ; then
# Avoid executing cc on OS X 10.9, as it ships with a stub
@@ -1334,15 +1320,18 @@
*:QNX:*:4*)
echo i386-pc-qnx
exit ;;
- NEO-?:NONSTOP_KERNEL:*:*)
+ NEO-*:NONSTOP_KERNEL:*:*)
echo neo-tandem-nsk${UNAME_RELEASE}
exit ;;
NSE-*:NONSTOP_KERNEL:*:*)
echo nse-tandem-nsk${UNAME_RELEASE}
exit ;;
- NSR-?:NONSTOP_KERNEL:*:*)
+ NSR-*:NONSTOP_KERNEL:*:*)
echo nsr-tandem-nsk${UNAME_RELEASE}
exit ;;
+ NSX-*:NONSTOP_KERNEL:*:*)
+ echo nsx-tandem-nsk${UNAME_RELEASE}
+ exit ;;
*:NonStop-UX:*:*)
echo mips-compaq-nonstopux
exit ;;
@@ -1414,16 +1403,28 @@
exit ;;
esac
+echo "$0: unable to guess system type" >&2
+
+case "${UNAME_MACHINE}:${UNAME_SYSTEM}" in
+ mips:Linux | mips64:Linux)
+ # If we got here on MIPS GNU/Linux, output extra information.
+ cat >&2 <<EOF
+
+NOTE: MIPS GNU/Linux systems require a C compiler to fully recognize
+the system type. Please install a C compiler and try again.
+EOF
+ ;;
+esac
+
cat >&2 <<EOF
-$0: unable to guess system type
This script (version $timestamp), has failed to recognize the
-operating system you are using. If your script is old, overwrite
-config.guess and config.sub with the latest versions from:
+operating system you are using. If your script is old, overwrite *all*
+copies of config.guess and config.sub with the latest versions from:
- http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
+ https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
and
- http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
+ https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
If $0 has already been updated, send the following data and any
information you think might be pertinent to config-patches@gnu.org to
@@ -1455,7 +1456,7 @@
exit 1
# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'write-file-functions 'time-stamp)
# time-stamp-start: "timestamp='"
# time-stamp-format: "%:y-%02m-%02d"
# time-stamp-end: "'"
diff --git a/config.h.in b/config.h.in
index 16317c6..dde4e35 100644
--- a/config.h.in
+++ b/config.h.in
@@ -64,9 +64,6 @@
/* GStreamer package release date/time for plugins as YYYY-MM-DD */
#undef GST_PACKAGE_RELEASE_DATETIME
-/* Define if static plugins should be built */
-#undef GST_PLUGIN_BUILD_STATIC
-
/* Define to enable a52dec (used by a52dec). */
#undef HAVE_A52DEC
@@ -169,9 +166,6 @@
/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H
-/* Define to enable lame mp3 encoder library (used by lame). */
-#undef HAVE_LAME
-
/* Define to 1 if you have the <malloc.h> header file. */
#undef HAVE_MALLOC_H
@@ -181,9 +175,6 @@
/* Define to enable mpeg2dec (used by mpeg2dec). */
#undef HAVE_MPEG2DEC
-/* Define to enable mpg123 audio decoder (used by mpg123). */
-#undef HAVE_MPG123
-
/* Use Orc */
#undef HAVE_ORC
@@ -214,9 +205,6 @@
/* Define to 1 if you have the <sys/types.h> header file. */
#undef HAVE_SYS_TYPES_H
-/* Define to enable twolame (used by twolame). */
-#undef HAVE_TWOLAME
-
/* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H
diff --git a/config.h.meson b/config.h.meson
deleted file mode 100644
index 4e4ece7..0000000
--- a/config.h.meson
+++ /dev/null
@@ -1,291 +0,0 @@
-/* config.h.in. Generated from configure.ac by autoheader. */
-
-/* Define if building universal (internal helper macro) */
-#mesondefine AC_APPLE_UNIVERSAL_BUILD
-
-/* Default audio sink */
-#mesondefine DEFAULT_AUDIOSINK
-
-/* Default audio source */
-#mesondefine DEFAULT_AUDIOSRC
-
-/* Default video sink */
-#mesondefine DEFAULT_VIDEOSINK
-
-/* Default video source */
-#mesondefine DEFAULT_VIDEOSRC
-
-/* Default visualizer */
-#mesondefine DEFAULT_VISUALIZER
-
-/* Disable Orc */
-#mesondefine DISABLE_ORC
-
-/* Define to 1 if translation of program messages to the user's native
- language is requested. */
-#mesondefine ENABLE_NLS
-
-/* gettext package name */
-#mesondefine GETTEXT_PACKAGE
-
-/* The GIO library directory. */
-#mesondefine GIO_LIBDIR
-
-/* The GIO modules directory. */
-#mesondefine GIO_MODULE_DIR
-
-/* GStreamer API Version */
-#mesondefine GST_API_VERSION
-
-/* macro to use to show function name */
-#mesondefine GST_FUNCTION
-
-/* Defined if gcov is enabled to force a rebuild due to config.h changing */
-#mesondefine GST_GCOV_ENABLED
-
-/* Default errorlevel to use */
-#mesondefine GST_LEVEL_DEFAULT
-
-/* GStreamer license */
-#mesondefine GST_LICENSE
-
-/* package name in plugins */
-#mesondefine GST_PACKAGE_NAME
-
-/* package origin */
-#mesondefine GST_PACKAGE_ORIGIN
-
-/* GStreamer package release date/time for plugins as YYYY-MM-DD */
-#mesondefine GST_PACKAGE_RELEASE_DATETIME
-
-/* Define if static plugins should be built */
-#mesondefine GST_PLUGIN_BUILD_STATIC
-
-/* Define to enable a52dec (used by a52dec). */
-#mesondefine HAVE_A52DEC
-
-/* Define to enable amrnb library (used by amrnb). */
-#mesondefine HAVE_AMRNB
-
-/* Define to enable amrwb library (used by amrwbdec). */
-#mesondefine HAVE_AMRWB
-
-/* Define to enable cdio library (used by cdio). */
-#mesondefine HAVE_CDIO
-
-/* Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the
- CoreFoundation framework. */
-#mesondefine HAVE_CFLOCALECOPYCURRENT
-
-/* Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in
- the CoreFoundation framework. */
-#mesondefine HAVE_CFPREFERENCESCOPYAPPVALUE
-
-/* Define if the target CPU is an Alpha */
-#mesondefine HAVE_CPU_ALPHA
-
-/* Define if the target CPU is an ARM */
-#mesondefine HAVE_CPU_ARM
-
-/* Define if the target CPU is a CRIS */
-#mesondefine HAVE_CPU_CRIS
-
-/* Define if the target CPU is a CRISv32 */
-#mesondefine HAVE_CPU_CRISV32
-
-/* Define if the target CPU is a HPPA */
-#mesondefine HAVE_CPU_HPPA
-
-/* Define if the target CPU is an x86 */
-#mesondefine HAVE_CPU_I386
-
-/* Define if the target CPU is a IA64 */
-#mesondefine HAVE_CPU_IA64
-
-/* Define if the target CPU is a M68K */
-#mesondefine HAVE_CPU_M68K
-
-/* Define if the target CPU is a MIPS */
-#mesondefine HAVE_CPU_MIPS
-
-/* Define if the target CPU is a PowerPC */
-#mesondefine HAVE_CPU_PPC
-
-/* Define if the target CPU is a 64 bit PowerPC */
-#mesondefine HAVE_CPU_PPC64
-
-/* Define if the target CPU is a S390 */
-#mesondefine HAVE_CPU_S390
-
-/* Define if the target CPU is a SPARC */
-#mesondefine HAVE_CPU_SPARC
-
-/* Define if the target CPU is a x86_64 */
-#mesondefine HAVE_CPU_X86_64
-
-/* Define if the GNU dcgettext() function is already present or preinstalled.
- */
-#mesondefine HAVE_DCGETTEXT
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-#mesondefine HAVE_DLFCN_H
-
-/* define for working do while(0) macros */
-#mesondefine HAVE_DOWHILE_MACROS
-
-/* Define to enable dvdread library (used by dvdreadsrc). */
-#mesondefine HAVE_DVDREAD
-
-/* Define to enable building of experimental plug-ins. */
-#mesondefine HAVE_EXPERIMENTAL
-
-/* Define to enable building of plug-ins with external deps. */
-#mesondefine HAVE_EXTERNAL
-
-/* defined if the compiler implements __func__ */
-#mesondefine HAVE_FUNC
-
-/* defined if the compiler implements __FUNCTION__ */
-#mesondefine HAVE_FUNCTION
-
-/* Define if the GNU gettext() function is already present or preinstalled. */
-#mesondefine HAVE_GETTEXT
-
-/* Define if you have the iconv() function and it works. */
-#mesondefine HAVE_ICONV
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#mesondefine HAVE_INTTYPES_H
-
-/* Define to enable lame mp3 encoder library (used by lame). */
-#mesondefine HAVE_LAME
-
-/* Define to 1 if you have the <malloc.h> header file. */
-#mesondefine HAVE_MALLOC_H
-
-/* Define to 1 if you have the <memory.h> header file. */
-#mesondefine HAVE_MEMORY_H
-
-/* Define to enable mpeg2dec (used by mpeg2dec). */
-#mesondefine HAVE_MPEG2DEC
-
-/* Defined for newer opencore-amrnb */
-#mesondefine HAVE_OPENCORE_AMRNB_0_1_3_OR_LATER
-
-/* Defined for newer opencore-amrwb */
-#mesondefine HAVE_OPENCORE_AMRWB_0_1_3_OR_LATER
-
-/* Use Orc */
-#mesondefine HAVE_ORC
-
-/* defined if the compiler implements __PRETTY_FUNCTION__ */
-#mesondefine HAVE_PRETTY_FUNCTION
-
-/* Define if RDTSC is available */
-#mesondefine HAVE_RDTSC
-
-/* Define to enable libsidplay (used by sid). */
-#mesondefine HAVE_SIDPLAY
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#mesondefine HAVE_STDINT_H
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#mesondefine HAVE_STDLIB_H
-
-/* Define to 1 if you have the <strings.h> header file. */
-#mesondefine HAVE_STRINGS_H
-
-/* Define to 1 if you have the <string.h> header file. */
-#mesondefine HAVE_STRING_H
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#mesondefine HAVE_SYS_STAT_H
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#mesondefine HAVE_SYS_TYPES_H
-
-/* Define to enable twolame (used by twolame). */
-#mesondefine HAVE_TWOLAME
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#mesondefine HAVE_UNISTD_H
-
-/* Define if valgrind should be used */
-#mesondefine HAVE_VALGRIND
-
-/* Define to 1 if you have the <winsock2.h> header file. */
-#mesondefine HAVE_WINSOCK2_H
-
-/* Define to enable x264 plug-in (used by x264). */
-#mesondefine HAVE_X264
-
-/* the host CPU */
-#mesondefine HOST_CPU
-
-/* gettext locale dir */
-#mesondefine LOCALEDIR
-
-/* Define to the sub-directory in which libtool stores uninstalled libraries.
- */
-#mesondefine LT_OBJDIR
-
-/* Name of package */
-#mesondefine PACKAGE
-
-/* Define to the address where bug reports for this package should be sent. */
-#mesondefine PACKAGE_BUGREPORT
-
-/* Define to the full name of this package. */
-#mesondefine PACKAGE_NAME
-
-/* Define to the full name and version of this package. */
-#mesondefine PACKAGE_STRING
-
-/* Define to the one symbol short name of this package. */
-#mesondefine PACKAGE_TARNAME
-
-/* Define to the home page for this package. */
-#mesondefine PACKAGE_URL
-
-/* Define to the version of this package. */
-#mesondefine PACKAGE_VERSION
-
-/* directory where plugins are located */
-#mesondefine PLUGINDIR
-
-/* The size of `char', as computed by sizeof. */
-#mesondefine SIZEOF_CHAR
-
-/* The size of `int', as computed by sizeof. */
-#mesondefine SIZEOF_INT
-
-/* The size of `long', as computed by sizeof. */
-#mesondefine SIZEOF_LONG
-
-/* The size of `short', as computed by sizeof. */
-#mesondefine SIZEOF_SHORT
-
-/* The size of `void*', as computed by sizeof. */
-#mesondefine SIZEOF_VOIDP
-
-/* Define to 1 if you have the ANSI C header files. */
-#mesondefine STDC_HEADERS
-
-/* the target CPU */
-#mesondefine TARGET_CPU
-
-/* Version number of package */
-#mesondefine VERSION
-
-/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
- significant byte first (like Motorola and SPARC, unlike Intel). */
-#if defined AC_APPLE_UNIVERSAL_BUILD
-# if defined __BIG_ENDIAN__
-# define WORDS_BIGENDIAN 1
-# endif
-#else
-# ifndef WORDS_BIGENDIAN
-# undef WORDS_BIGENDIAN
-# endif
-#endif
diff --git a/config.sub b/config.sub
index dd2ca93..00f68b8 100755
--- a/config.sub
+++ b/config.sub
@@ -1,8 +1,8 @@
#! /bin/sh
# Configuration validation subroutine script.
-# Copyright 1992-2016 Free Software Foundation, Inc.
+# Copyright 1992-2017 Free Software Foundation, Inc.
-timestamp='2016-11-04'
+timestamp='2017-11-23'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -15,7 +15,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, see <http://www.gnu.org/licenses/>.
+# along with this program; if not, see <https://www.gnu.org/licenses/>.
#
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -33,7 +33,7 @@
# Otherwise, we print the canonical config type on stdout and succeed.
# You can get the latest version of this script from:
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
+# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
# This file is supposed to be the same for all GNU packages
# and recognize all the CPU types, system types and aliases
@@ -57,7 +57,7 @@
Canonicalize a configuration name.
-Operation modes:
+Options:
-h, --help print this help, then exit
-t, --time-stamp print date of last modification, then exit
-v, --version print version number, then exit
@@ -67,7 +67,7 @@
version="\
GNU config.sub ($timestamp)
-Copyright 1992-2016 Free Software Foundation, Inc.
+Copyright 1992-2017 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -229,9 +229,6 @@
-ptx*)
basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
;;
- -windowsnt*)
- os=`echo $os | sed -e 's/windowsnt/winnt/'`
- ;;
-psos*)
os=-psos
;;
@@ -263,7 +260,7 @@
| fido | fr30 | frv | ft32 \
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
| hexagon \
- | i370 | i860 | i960 | ia64 \
+ | i370 | i860 | i960 | ia16 | ia64 \
| ip2k | iq2000 \
| k1om \
| le32 | le64 \
@@ -315,7 +312,7 @@
| ubicom32 \
| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
| visium \
- | we32k \
+ | wasm32 \
| x86 | xc16x | xstormy16 | xtensa \
| z8k | z80)
basic_machine=$basic_machine-unknown
@@ -388,7 +385,7 @@
| h8300-* | h8500-* \
| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
| hexagon-* \
- | i*86-* | i860-* | i960-* | ia64-* \
+ | i*86-* | i860-* | i960-* | ia16-* | ia64-* \
| ip2k-* | iq2000-* \
| k1om-* \
| le32-* | le64-* \
@@ -446,6 +443,7 @@
| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
| vax-* \
| visium-* \
+ | wasm32-* \
| we32k-* \
| x86-* | x86_64-* | xc16x-* | xps100-* \
| xstormy16-* | xtensa*-* \
@@ -641,7 +639,7 @@
basic_machine=rs6000-bull
os=-bosx
;;
- dpx2* | dpx2*-bull)
+ dpx2*)
basic_machine=m68k-bull
os=-sysv3
;;
@@ -903,7 +901,7 @@
basic_machine=v70-nec
os=-sysv
;;
- next | m*-next )
+ next | m*-next)
basic_machine=m68k-next
case $os in
-nextstep* )
@@ -948,6 +946,9 @@
nsr-tandem)
basic_machine=nsr-tandem
;;
+ nsx-tandem)
+ basic_machine=nsx-tandem
+ ;;
op50n-* | op60c-*)
basic_machine=hppa1.1-oki
os=-proelf
@@ -1243,6 +1244,9 @@
basic_machine=a29k-wrs
os=-vxworks
;;
+ wasm32)
+ basic_machine=wasm32-unknown
+ ;;
w65*)
basic_machine=w65-wdc
os=-none
@@ -1251,6 +1255,9 @@
basic_machine=hppa1.1-winbond
os=-proelf
;;
+ x64)
+ basic_machine=x86_64-pc
+ ;;
xbox)
basic_machine=i686-pc
os=-mingw32
@@ -1358,8 +1365,8 @@
if [ x"$os" != x"" ]
then
case $os in
- # First match some system type aliases
- # that might get confused with valid system types.
+ # First match some system type aliases that might get confused
+ # with valid system types.
# -solaris* is a basic system type, with this one exception.
-auroraux)
os=-auroraux
@@ -1379,9 +1386,9 @@
-gnu/linux*)
os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
;;
- # First accept the basic system types.
+ # Now accept the basic system types.
# The portable systems comes first.
- # Each alternative MUST END IN A *, to match a version number.
+ # Each alternative MUST end in a * to match a version number.
# -sysv* is not here because it comes later, after sysvr4.
-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
| -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
@@ -1397,7 +1404,7 @@
| -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
| -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
- | -chorusos* | -chorusrdb* | -cegcc* \
+ | -chorusos* | -chorusrdb* | -cegcc* | -glidix* \
| -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
| -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
| -linux-newlib* | -linux-musl* | -linux-uclibc* \
@@ -1409,7 +1416,7 @@
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
| -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \
- | -onefs* | -tirtos* | -phoenix* | -fuchsia*)
+ | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox*)
# Remember, each alternative MUST END IN *, to match a version number.
;;
-qnx*)
@@ -1484,7 +1491,7 @@
-nova*)
os=-rtmk-nova
;;
- -ns2 )
+ -ns2)
os=-nextstep2
;;
-nsk*)
@@ -1539,6 +1546,19 @@
-dicos*)
os=-dicos
;;
+ -pikeos*)
+ # Until real need of OS specific support for
+ # particular features comes up, bare metal
+ # configurations are quite functional.
+ case $basic_machine in
+ arm*)
+ os=-eabi
+ ;;
+ *)
+ os=-elf
+ ;;
+ esac
+ ;;
-nacl*)
;;
-ios)
@@ -1638,6 +1658,9 @@
sparc-* | *-sun)
os=-sunos4.1.1
;;
+ pru-*)
+ os=-elf
+ ;;
*-be)
os=-beos
;;
@@ -1683,7 +1706,7 @@
m88k-omron*)
os=-luna
;;
- *-next )
+ *-next)
os=-nextstep
;;
*-sequent)
@@ -1818,7 +1841,7 @@
exit
# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'write-file-functions 'time-stamp)
# time-stamp-start: "timestamp='"
# time-stamp-format: "%:y-%02m-%02d"
# time-stamp-end: "'"
diff --git a/configure b/configure
index 6dde364..a13f116 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for GStreamer Ugly Plug-ins 1.12.4.
+# Generated by GNU Autoconf 2.69 for GStreamer Ugly Plug-ins 1.13.1.
#
# Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer>.
#
@@ -591,8 +591,8 @@
# Identity of this package.
PACKAGE_NAME='GStreamer Ugly Plug-ins'
PACKAGE_TARNAME='gst-plugins-ugly'
-PACKAGE_VERSION='1.12.4'
-PACKAGE_STRING='GStreamer Ugly Plug-ins 1.12.4'
+PACKAGE_VERSION='1.13.1'
+PACKAGE_STRING='GStreamer Ugly Plug-ins 1.13.1'
PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer'
PACKAGE_URL=''
@@ -643,33 +643,23 @@
GST_CXXFLAGS
GST_OPTION_CXXFLAGS
GST_OPTION_CFLAGS
+EXTRA_CFLAGS
+VISIBILITY_CXXFLAGS
+VISIBILITY_CFLAGS
DEPRECATED_CFLAGS
PROFILE_CFLAGS
USE_X264_FALSE
USE_X264_TRUE
X264_LIBS
X264_CFLAGS
-USE_TWOLAME_FALSE
-USE_TWOLAME_TRUE
-TWOLAME_LIBS
-TWOLAME_CFLAGS
USE_SIDPLAY_FALSE
USE_SIDPLAY_TRUE
SIDPLAY_LIBS
SIDPLAY_CFLAGS
-USE_MPG123_FALSE
-USE_MPG123_TRUE
-MPG123_LIBS
-MPG123_CFLAGS
USE_MPEG2DEC_FALSE
USE_MPEG2DEC_TRUE
MPEG2DEC_LIBS
MPEG2DEC_CFLAGS
-USE_LAME_FALSE
-USE_LAME_TRUE
-HAVE_LAME
-LAME_LIBS
-LAME_CFLAGS
USE_DVDREAD_FALSE
USE_DVDREAD_TRUE
DVDREAD_LIBS
@@ -711,9 +701,6 @@
WARNING_CXXFLAGS
ERROR_CFLAGS
WARNING_CFLAGS
-GST_PLUGIN_BUILD_STATIC_FALSE
-GST_PLUGIN_BUILD_STATIC_TRUE
-GST_PLUGIN_LIBTOOLFLAGS
plugindir
PLUGINDIR
GST_LICENSE
@@ -1041,7 +1028,6 @@
enable_glib_asserts
enable_orc
enable_Bsymbolic
-enable_static_plugins
with_default_audiosink
with_default_audiosrc
with_default_videosink
@@ -1058,11 +1044,8 @@
enable_amrwb
enable_cdio
enable_dvdread
-enable_lame
enable_mpeg2dec
-enable_mpg123
enable_sidplay
-enable_twolame
enable_x264
with_x264_libraries
'
@@ -1110,10 +1093,6 @@
CDIO_LIBS
MPEG2DEC_CFLAGS
MPEG2DEC_LIBS
-MPG123_CFLAGS
-MPG123_LIBS
-TWOLAME_CFLAGS
-TWOLAME_LIBS
X264_CFLAGS
X264_LIBS'
@@ -1666,7 +1645,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures GStreamer Ugly Plug-ins 1.12.4 to adapt to many kinds of systems.
+\`configure' configures GStreamer Ugly Plug-ins 1.13.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1739,7 +1718,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of GStreamer Ugly Plug-ins 1.12.4:";;
+ short | recursive ) echo "Configuration of GStreamer Ugly Plug-ins 1.13.1:";;
esac
cat <<\_ACEOF
@@ -1783,7 +1762,6 @@
Enable GLib assertion
--enable-orc use Orc if installed
--disable-Bsymbolic avoid linking with -Bsymbolic
- --enable-static-plugins build static plugins [default=no]
--disable-asfdemux disable dependency-less asfdemux plugin
--disable-dvdlpcmdec disable dependency-less dvdlpcmdec plugin
--disable-dvdsub disable dependency-less dvdsub plugin
@@ -1794,11 +1772,8 @@
--disable-amrwb disable amrwb library: amrwbdec
--disable-cdio disable cdio library: cdio
--disable-dvdread disable dvdread library: dvdreadsrc
- --disable-lame disable lame mp3 encoder library: lame
--disable-mpeg2dec disable mpeg2dec: mpeg2dec
- --disable-mpg123 disable mpg123 audio decoder: mpg123
--disable-sidplay disable libsidplay: sid
- --disable-twolame disable twolame: twolame
--disable-x264 disable x264 plug-in: x264
Optional Packages:
@@ -1905,13 +1880,6 @@
C compiler flags for MPEG2DEC, overriding pkg-config
MPEG2DEC_LIBS
linker flags for MPEG2DEC, overriding pkg-config
- MPG123_CFLAGS
- C compiler flags for MPG123, overriding pkg-config
- MPG123_LIBS linker flags for MPG123, overriding pkg-config
- TWOLAME_CFLAGS
- C compiler flags for TWOLAME, overriding pkg-config
- TWOLAME_LIBS
- linker flags for TWOLAME, overriding pkg-config
X264_CFLAGS C compiler flags for X264, overriding pkg-config
X264_LIBS linker flags for X264, overriding pkg-config
@@ -1981,7 +1949,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-GStreamer Ugly Plug-ins configure 1.12.4
+GStreamer Ugly Plug-ins configure 1.13.1
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2887,7 +2855,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by GStreamer Ugly Plug-ins $as_me 1.12.4, which was
+It was created by GStreamer Ugly Plug-ins $as_me 1.13.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -3866,7 +3834,7 @@
# Define the identity of the package.
PACKAGE='gst-plugins-ugly'
- VERSION='1.12.4'
+ VERSION='1.13.1'
cat >>confdefs.h <<_ACEOF
@@ -4077,9 +4045,9 @@
- PACKAGE_VERSION_MAJOR=$(echo 1.12.4 | cut -d'.' -f1)
- PACKAGE_VERSION_MINOR=$(echo 1.12.4 | cut -d'.' -f2)
- PACKAGE_VERSION_MICRO=$(echo 1.12.4 | cut -d'.' -f3)
+ PACKAGE_VERSION_MAJOR=$(echo 1.13.1 | cut -d'.' -f1)
+ PACKAGE_VERSION_MINOR=$(echo 1.13.1 | cut -d'.' -f2)
+ PACKAGE_VERSION_MICRO=$(echo 1.13.1 | cut -d'.' -f3)
@@ -4090,7 +4058,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking nano version" >&5
$as_echo_n "checking nano version... " >&6; }
- NANO=$(echo 1.12.4 | cut -d'.' -f4)
+ NANO=$(echo 1.13.1 | cut -d'.' -f4)
if test x"$NANO" = x || test "x$NANO" = "x0" ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: 0 (release)" >&5
@@ -8924,10 +8892,10 @@
done
- GST_CURRENT=1204
+ GST_CURRENT=1301
GST_REVISION=0
- GST_AGE=1204
- GST_LIBVERSION=1204:0:1204
+ GST_AGE=1301
+ GST_LIBVERSION=1301:0:1301
@@ -13555,8 +13523,8 @@
-GST_REQ=1.12.0
-GSTPB_REQ=1.12.0
+GST_REQ=1.13.1
+GSTPB_REQ=1.13.1
@@ -24485,42 +24453,6 @@
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static plugins or not" >&5
-$as_echo_n "checking whether to build static plugins or not... " >&6; }
-# Check whether --enable-static-plugins was given.
-if test "${enable_static_plugins+set}" = set; then :
- enableval=$enable_static_plugins; case $enableval in #(
- no) :
- ;; #(
- yes) :
- ;; #(
- *) :
- as_fn_error $? "bad value \"$enableval\" for --enable-static-plugins" "$LINENO" 5 ;;
-esac
-else
- enable_static_plugins=no
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static_plugins" >&5
-$as_echo "$enable_static_plugins" >&6; }
-if test "x$enable_static_plugins" = xyes; then
-
-$as_echo "#define GST_PLUGIN_BUILD_STATIC 1" >>confdefs.h
-
- GST_PLUGIN_LIBTOOLFLAGS=""
-else
- GST_PLUGIN_LIBTOOLFLAGS="--tag=disable-static"
-fi
-
- if test "x$enable_static_plugins" = "xyes"; then
- GST_PLUGIN_BUILD_STATIC_TRUE=
- GST_PLUGIN_BUILD_STATIC_FALSE='#'
-else
- GST_PLUGIN_BUILD_STATIC_TRUE='#'
- GST_PLUGIN_BUILD_STATIC_FALSE=
-fi
-
-
@@ -26549,201 +26481,6 @@
echo
-{ $as_echo "$as_me:${as_lineno-$LINENO}: *** checking feature: lame mp3 encoder library ***" >&5
-$as_echo "$as_me: *** checking feature: lame mp3 encoder library ***" >&6;}
-if test "xlame" != "x"
-then
- { $as_echo "$as_me:${as_lineno-$LINENO}: *** for plug-ins: lame ***" >&5
-$as_echo "$as_me: *** for plug-ins: lame ***" >&6;}
-fi
-NOUSE=
-if test "x$USE_LAME" = "xno"; then
- NOUSE="yes"
-fi
-# Check whether --enable-lame was given.
-if test "${enable_lame+set}" = set; then :
- enableval=$enable_lame; case "${enableval}" in
- yes) USE_LAME=yes;;
- no) USE_LAME=no;;
- *) as_fn_error $? "bad value ${enableval} for --enable-lame" "$LINENO" 5 ;;
- esac
-else
- USE_LAME=yes
-fi
-
-if test "x$NOUSE" = "xyes"; then
- USE_LAME="no"
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** lame pre-configured not to be built" >&5
-$as_echo "$as_me: WARNING: *** lame pre-configured not to be built" >&2;}
-fi
-NOUSE=
-
-if echo " $GST_PLUGINS_NONPORTED " | tr , ' ' | grep -i " LAME " > /dev/null; then
- USE_LAME="no"
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** lame not ported" >&5
-$as_echo "$as_me: WARNING: *** lame not ported" >&2;}
-fi
-
-
-if test x$USE_LAME = xyes; then
-
- gst_check_save_LIBS=$LIBS
- gst_check_save_LDFLAGS=$LDFLAGS
- gst_check_save_CFLAGS=$CFLAGS
- gst_check_save_CPPFLAGS=$CPPFLAGS
- gst_check_save_CXXFLAGS=$CXXFLAGS
-
- HAVE_LAME=no
-
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for lame_init in -lmp3lame" >&5
-$as_echo_n "checking for lame_init in -lmp3lame... " >&6; }
-if ${ac_cv_lib_mp3lame_lame_init+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lmp3lame $LIBM $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char lame_init ();
-int
-main ()
-{
-return lame_init ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_mp3lame_lame_init=yes
-else
- ac_cv_lib_mp3lame_lame_init=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mp3lame_lame_init" >&5
-$as_echo "$ac_cv_lib_mp3lame_lame_init" >&6; }
-if test "x$ac_cv_lib_mp3lame_lame_init" = xyes; then :
- HAVE_LAME=yes
-else
- HAVE_LAME=no
-fi
-
- if test "x$HAVE_LAME" = "xyes"; then
- ac_fn_c_check_header_mongrel "$LINENO" "lame/lame.h" "ac_cv_header_lame_lame_h" "$ac_includes_default"
-if test "x$ac_cv_header_lame_lame_h" = xyes; then :
- :
-else
- HAVE_LAME=no
-fi
-
-
- if test "x$HAVE_LAME" = "xyes"; then
-
- HAVE_LAME="yes"
- LAME_LIBS="-lmp3lame $LIBM"
- LAME_CFLAGS=""
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <lame/lame.h>
-int
-main ()
-{
- int preset = MEDIUM
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- LAME_CFLAGS="-DGSTLAME_PRESET"
-else
- LAME_CFLAGS=""
-
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <lame/lame.h>
-int
-main ()
-{
-
- void *ptr = &lame_set_VBR_quality
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- LAME_CFLAGS="$LAME_CFLAGS -DHAVE_LAME_SET_VBR_QUALITY"
-else
- LAME_CFLAGS="$LAME_CFLAGS"
-
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-
-
- else
- :
- fi
- else
- :
- fi
-
-
-
-
-
- LIBS=$gst_check_save_LIBS
- LDFLAGS=$gst_check_save_LDFLAGS
- CFLAGS=$gst_check_save_CFLAGS
- CPPFLAGS=$gst_check_save_CPPFLAGS
- CXXFLAGS=$gst_check_save_CXXFLAGS
-
- if test x$HAVE_LAME = xno; then
- USE_LAME=no
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: *** These plugins will be built: lame" >&5
-$as_echo "$as_me: *** These plugins will be built: lame" >&6;}
- fi
-fi
-if test x$USE_LAME = xyes; then
- :
- if test "xlame" != "x"; then
- GST_PLUGINS_YES="\tlame\n$GST_PLUGINS_YES"
- fi
-
-$as_echo "#define HAVE_LAME /**/" >>confdefs.h
-
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: *** These plugins will not be built: lame" >&5
-$as_echo "$as_me: *** These plugins will not be built: lame" >&6;}
- if test "xlame" != "x"; then
- GST_PLUGINS_NO="\tlame\n$GST_PLUGINS_NO"
- fi
- :
-fi
- if test x$USE_LAME = xyes; then
- USE_LAME_TRUE=
- USE_LAME_FALSE='#'
-else
- USE_LAME_TRUE='#'
- USE_LAME_FALSE=
-fi
-
-
-
-echo
{ $as_echo "$as_me:${as_lineno-$LINENO}: *** checking feature: mpeg2dec ***" >&5
$as_echo "$as_me: *** checking feature: mpeg2dec ***" >&6;}
if test "xmpeg2dec" != "x"
@@ -26926,167 +26663,6 @@
-echo
-{ $as_echo "$as_me:${as_lineno-$LINENO}: *** checking feature: mpg123 audio decoder ***" >&5
-$as_echo "$as_me: *** checking feature: mpg123 audio decoder ***" >&6;}
-if test "xmpg123" != "x"
-then
- { $as_echo "$as_me:${as_lineno-$LINENO}: *** for plug-ins: mpg123 ***" >&5
-$as_echo "$as_me: *** for plug-ins: mpg123 ***" >&6;}
-fi
-NOUSE=
-if test "x$USE_MPG123" = "xno"; then
- NOUSE="yes"
-fi
-# Check whether --enable-mpg123 was given.
-if test "${enable_mpg123+set}" = set; then :
- enableval=$enable_mpg123; case "${enableval}" in
- yes) USE_MPG123=yes;;
- no) USE_MPG123=no;;
- *) as_fn_error $? "bad value ${enableval} for --enable-mpg123" "$LINENO" 5 ;;
- esac
-else
- USE_MPG123=yes
-fi
-
-if test "x$NOUSE" = "xyes"; then
- USE_MPG123="no"
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** mpg123 pre-configured not to be built" >&5
-$as_echo "$as_me: WARNING: *** mpg123 pre-configured not to be built" >&2;}
-fi
-NOUSE=
-
-if echo " $GST_PLUGINS_NONPORTED " | tr , ' ' | grep -i " MPG123 " > /dev/null; then
- USE_MPG123="no"
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** mpg123 not ported" >&5
-$as_echo "$as_me: WARNING: *** mpg123 not ported" >&2;}
-fi
-
-
-if test x$USE_MPG123 = xyes; then
-
- gst_check_save_LIBS=$LIBS
- gst_check_save_LDFLAGS=$LDFLAGS
- gst_check_save_CFLAGS=$CFLAGS
- gst_check_save_CPPFLAGS=$CPPFLAGS
- gst_check_save_CXXFLAGS=$CXXFLAGS
-
- HAVE_MPG123=no
-
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MPG123" >&5
-$as_echo_n "checking for MPG123... " >&6; }
-
-if test -n "$PKG_CONFIG"; then
- if test -n "$MPG123_CFLAGS"; then
- pkg_cv_MPG123_CFLAGS="$MPG123_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmpg123 >= 1.13\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libmpg123 >= 1.13") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- pkg_cv_MPG123_CFLAGS=`$PKG_CONFIG --cflags "libmpg123 >= 1.13" 2>/dev/null`
-else
- pkg_failed=yes
-fi
- fi
-else
- pkg_failed=untried
-fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$MPG123_LIBS"; then
- pkg_cv_MPG123_LIBS="$MPG123_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmpg123 >= 1.13\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libmpg123 >= 1.13") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- pkg_cv_MPG123_LIBS=`$PKG_CONFIG --libs "libmpg123 >= 1.13" 2>/dev/null`
-else
- pkg_failed=yes
-fi
- fi
-else
- pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
- _pkg_short_errors_supported=yes
-else
- _pkg_short_errors_supported=no
-fi
- if test $_pkg_short_errors_supported = yes; then
- MPG123_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libmpg123 >= 1.13"`
- else
- MPG123_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libmpg123 >= 1.13"`
- fi
- # Put the nasty error message in config.log where it belongs
- echo "$MPG123_PKG_ERRORS" >&5
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- HAVE_MPG123="no"
-elif test $pkg_failed = untried; then
- HAVE_MPG123="no"
-else
- MPG123_CFLAGS=$pkg_cv_MPG123_CFLAGS
- MPG123_LIBS=$pkg_cv_MPG123_LIBS
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
- HAVE_MPG123="yes"
-fi
-
-
-
-
- LIBS=$gst_check_save_LIBS
- LDFLAGS=$gst_check_save_LDFLAGS
- CFLAGS=$gst_check_save_CFLAGS
- CPPFLAGS=$gst_check_save_CPPFLAGS
- CXXFLAGS=$gst_check_save_CXXFLAGS
-
- if test x$HAVE_MPG123 = xno; then
- USE_MPG123=no
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: *** These plugins will be built: mpg123" >&5
-$as_echo "$as_me: *** These plugins will be built: mpg123" >&6;}
- fi
-fi
-if test x$USE_MPG123 = xyes; then
- :
- if test "xmpg123" != "x"; then
- GST_PLUGINS_YES="\tmpg123\n$GST_PLUGINS_YES"
- fi
-
-$as_echo "#define HAVE_MPG123 /**/" >>confdefs.h
-
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: *** These plugins will not be built: mpg123" >&5
-$as_echo "$as_me: *** These plugins will not be built: mpg123" >&6;}
- if test "xmpg123" != "x"; then
- GST_PLUGINS_NO="\tmpg123\n$GST_PLUGINS_NO"
- fi
- :
-fi
- if test x$USE_MPG123 = xyes; then
- USE_MPG123_TRUE=
- USE_MPG123_FALSE='#'
-else
- USE_MPG123_TRUE='#'
- USE_MPG123_FALSE=
-fi
-
-
-
echo
{ $as_echo "$as_me:${as_lineno-$LINENO}: *** checking feature: libsidplay ***" >&5
@@ -27245,172 +26821,6 @@
echo
-{ $as_echo "$as_me:${as_lineno-$LINENO}: *** checking feature: twolame ***" >&5
-$as_echo "$as_me: *** checking feature: twolame ***" >&6;}
-if test "xtwolame" != "x"
-then
- { $as_echo "$as_me:${as_lineno-$LINENO}: *** for plug-ins: twolame ***" >&5
-$as_echo "$as_me: *** for plug-ins: twolame ***" >&6;}
-fi
-NOUSE=
-if test "x$USE_TWOLAME" = "xno"; then
- NOUSE="yes"
-fi
-# Check whether --enable-twolame was given.
-if test "${enable_twolame+set}" = set; then :
- enableval=$enable_twolame; case "${enableval}" in
- yes) USE_TWOLAME=yes;;
- no) USE_TWOLAME=no;;
- *) as_fn_error $? "bad value ${enableval} for --enable-twolame" "$LINENO" 5 ;;
- esac
-else
- USE_TWOLAME=yes
-fi
-
-if test "x$NOUSE" = "xyes"; then
- USE_TWOLAME="no"
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** twolame pre-configured not to be built" >&5
-$as_echo "$as_me: WARNING: *** twolame pre-configured not to be built" >&2;}
-fi
-NOUSE=
-
-if echo " $GST_PLUGINS_NONPORTED " | tr , ' ' | grep -i " TWOLAME " > /dev/null; then
- USE_TWOLAME="no"
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** twolame not ported" >&5
-$as_echo "$as_me: WARNING: *** twolame not ported" >&2;}
-fi
-
-
-if test x$USE_TWOLAME = xyes; then
-
- gst_check_save_LIBS=$LIBS
- gst_check_save_LDFLAGS=$LDFLAGS
- gst_check_save_CFLAGS=$CFLAGS
- gst_check_save_CPPFLAGS=$CPPFLAGS
- gst_check_save_CXXFLAGS=$CXXFLAGS
-
- HAVE_TWOLAME=no
-
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for TWOLAME" >&5
-$as_echo_n "checking for TWOLAME... " >&6; }
-
-if test -n "$PKG_CONFIG"; then
- if test -n "$TWOLAME_CFLAGS"; then
- pkg_cv_TWOLAME_CFLAGS="$TWOLAME_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"twolame >= 0.3.10\""; } >&5
- ($PKG_CONFIG --exists --print-errors "twolame >= 0.3.10") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- pkg_cv_TWOLAME_CFLAGS=`$PKG_CONFIG --cflags "twolame >= 0.3.10" 2>/dev/null`
-else
- pkg_failed=yes
-fi
- fi
-else
- pkg_failed=untried
-fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$TWOLAME_LIBS"; then
- pkg_cv_TWOLAME_LIBS="$TWOLAME_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"twolame >= 0.3.10\""; } >&5
- ($PKG_CONFIG --exists --print-errors "twolame >= 0.3.10") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- pkg_cv_TWOLAME_LIBS=`$PKG_CONFIG --libs "twolame >= 0.3.10" 2>/dev/null`
-else
- pkg_failed=yes
-fi
- fi
-else
- pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
- _pkg_short_errors_supported=yes
-else
- _pkg_short_errors_supported=no
-fi
- if test $_pkg_short_errors_supported = yes; then
- TWOLAME_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "twolame >= 0.3.10"`
- else
- TWOLAME_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "twolame >= 0.3.10"`
- fi
- # Put the nasty error message in config.log where it belongs
- echo "$TWOLAME_PKG_ERRORS" >&5
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
- HAVE_TWOLAME="no"
-
-elif test $pkg_failed = untried; then
-
- HAVE_TWOLAME="no"
-
-else
- TWOLAME_CFLAGS=$pkg_cv_TWOLAME_CFLAGS
- TWOLAME_LIBS=$pkg_cv_TWOLAME_LIBS
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
- HAVE_TWOLAME="yes"
-fi
-
-
-
-
- LIBS=$gst_check_save_LIBS
- LDFLAGS=$gst_check_save_LDFLAGS
- CFLAGS=$gst_check_save_CFLAGS
- CPPFLAGS=$gst_check_save_CPPFLAGS
- CXXFLAGS=$gst_check_save_CXXFLAGS
-
- if test x$HAVE_TWOLAME = xno; then
- USE_TWOLAME=no
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: *** These plugins will be built: twolame" >&5
-$as_echo "$as_me: *** These plugins will be built: twolame" >&6;}
- fi
-fi
-if test x$USE_TWOLAME = xyes; then
- :
- if test "xtwolame" != "x"; then
- GST_PLUGINS_YES="\ttwolame\n$GST_PLUGINS_YES"
- fi
-
-$as_echo "#define HAVE_TWOLAME /**/" >>confdefs.h
-
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: *** These plugins will not be built: twolame" >&5
-$as_echo "$as_me: *** These plugins will not be built: twolame" >&6;}
- if test "xtwolame" != "x"; then
- GST_PLUGINS_NO="\ttwolame\n$GST_PLUGINS_NO"
- fi
- :
-fi
- if test x$USE_TWOLAME = xyes; then
- USE_TWOLAME_TRUE=
- USE_TWOLAME_FALSE='#'
-else
- USE_TWOLAME_TRUE='#'
- USE_TWOLAME_FALSE=
-fi
-
-
-
-echo
{ $as_echo "$as_me:${as_lineno-$LINENO}: *** checking feature: x264 plug-in ***" >&5
$as_echo "$as_me: *** checking feature: x264 plug-in ***" >&6;}
if test "xx264" != "x"
@@ -27653,14 +27063,6 @@
fi
if false; then
- USE_LAME_TRUE=
- USE_LAME_FALSE='#'
-else
- USE_LAME_TRUE='#'
- USE_LAME_FALSE=
-fi
-
- if false; then
USE_MPEG2DEC_TRUE=
USE_MPEG2DEC_FALSE='#'
else
@@ -27669,14 +27071,6 @@
fi
if false; then
- USE_MPG123_TRUE=
- USE_MPG123_FALSE='#'
-else
- USE_MPG123_TRUE='#'
- USE_MPG123_FALSE=
-fi
-
- if false; then
USE_SIDPLAY_TRUE=
USE_SIDPLAY_FALSE='#'
else
@@ -27685,14 +27079,6 @@
fi
if false; then
- USE_TWOLAME_TRUE=
- USE_TWOLAME_FALSE='#'
-else
- USE_TWOLAME_TRUE='#'
- USE_TWOLAME_FALSE=
-fi
-
- if false; then
USE_X264_TRUE=
USE_X264_FALSE='#'
else
@@ -27716,14 +27102,149 @@
fi
+VISIBILITY_CFLAGS=""
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking to see if compiler understands -fvisibility=hidden" >&5
+$as_echo_n "checking to see if compiler understands -fvisibility=hidden... " >&6; }
+
+ save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS -fvisibility=hidden"
+
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ flag_ok=yes
+else
+ flag_ok=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ CFLAGS="$save_CFLAGS"
+
+ if test "X$flag_ok" = Xyes ; then
+ VISIBILITY_CFLAGS="-fvisibility=hidden"
+ true
+ else
+
+ true
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $flag_ok" >&5
+$as_echo "$flag_ok" >&6; }
+
+
+
+VISIBILITY_CXXFLAGS=""
+if test "x$HAVE_CXX" = "xyes"; then
+
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking to see if c++ compiler understands -fvisibility=hidden" >&5
+$as_echo_n "checking to see if c++ compiler understands -fvisibility=hidden... " >&6; }
+
+ save_CPPFLAGS="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS -fvisibility=hidden"
+
+ ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+ flag_ok=yes
+else
+ flag_ok=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ CPPFLAGS="$save_CPPFLAGS"
+
+ if test "X$flag_ok" = Xyes ; then
+ VISIBILITY_CXXFLAGS="-fvisibility=hidden"
+ true
+ else
+
+ true
+ fi
+
+ ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $flag_ok" >&5
+$as_echo "$flag_ok" >&6; }
+
+fi
+
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking to see if compiler understands -fno-strict-aliasing" >&5
+$as_echo_n "checking to see if compiler understands -fno-strict-aliasing... " >&6; }
+
+ save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS -fno-strict-aliasing"
+
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ flag_ok=yes
+else
+ flag_ok=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ CFLAGS="$save_CFLAGS"
+
+ if test "X$flag_ok" = Xyes ; then
+ EXTRA_CFLAGS="-fno-strict-aliasing"
+ true
+ else
+
+ true
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $flag_ok" >&5
+$as_echo "$flag_ok" >&6; }
+
+
+
GST_OPTION_CFLAGS="\$(WARNING_CFLAGS) \$(ERROR_CFLAGS) \$(DEBUG_CFLAGS) \$(PROFILE_CFLAGS) \$(GCOV_CFLAGS) \$(OPT_CFLAGS) \$(DEPRECATED_CFLAGS)"
GST_OPTION_CXXFLAGS="\$(WARNING_CXXFLAGS) \$(ERROR_CXXFLAGS) \$(DEBUG_CFLAGS) \$(PROFILE_CFLAGS) \$(GCOV_CFLAGS) \$(OPT_CFLAGS) \$(DEPRECATED_CFLAGS)"
GST_CFLAGS="$GST_CFLAGS"
-GST_CXXFLAGS="-I\$(top_srcdir)/gst-libs -I\$(top_builddir)/gst-libs $GST_CFLAGS $GLIB_EXTRA_CFLAGS \$(GST_OPTION_CXXFLAGS)"
-GST_CFLAGS="-I\$(top_srcdir)/gst-libs -I\$(top_builddir)/gst-libs $GST_CFLAGS $GLIB_EXTRA_CFLAGS \$(GST_OPTION_CFLAGS)"
+GST_CXXFLAGS="-I\$(top_srcdir)/gst-libs -I\$(top_builddir)/gst-libs $GST_CFLAGS $EXTRA_CFLAGS $GLIB_EXTRA_CFLAGS \$(GST_OPTION_CXXFLAGS) \$(VISIBILITY_CXXFLAGS)"
+GST_CFLAGS="-I\$(top_srcdir)/gst-libs -I\$(top_builddir)/gst-libs $GST_CFLAGS $EXTRA_CFLAGS $GLIB_EXTRA_CFLAGS \$(GST_OPTION_CFLAGS) \$(VISIBILITY_CFLAGS)"
@@ -27734,11 +27255,11 @@
fi
-GST_PLUGIN_LDFLAGS="-module -avoid-version -export-symbols-regex '^_*gst_plugin_.*' $GST_ALL_LDFLAGS"
+GST_PLUGIN_LDFLAGS="-module -avoid-version $GST_ALL_LDFLAGS"
-ac_config_files="$ac_config_files Makefile common/Makefile common/m4/Makefile gst-libs/Makefile gst-libs/gst/Makefile gst/Makefile gst/asfdemux/Makefile gst/dvdlpcmdec/Makefile gst/dvdsub/Makefile gst/realmedia/Makefile gst/xingmux/Makefile ext/Makefile ext/a52dec/Makefile ext/amrnb/Makefile ext/amrwbdec/Makefile ext/cdio/Makefile ext/dvdread/Makefile ext/lame/Makefile ext/mpeg2dec/Makefile ext/mpg123/Makefile ext/sidplay/Makefile ext/twolame/Makefile ext/x264/Makefile docs/Makefile docs/plugins/Makefile docs/version.entities tests/Makefile tests/check/Makefile tests/files/Makefile m4/Makefile po/Makefile.in pkgconfig/Makefile pkgconfig/gstreamer-plugins-ugly-uninstalled.pc"
+ac_config_files="$ac_config_files Makefile common/Makefile common/m4/Makefile gst-libs/Makefile gst-libs/gst/Makefile gst/Makefile gst/asfdemux/Makefile gst/dvdlpcmdec/Makefile gst/dvdsub/Makefile gst/realmedia/Makefile gst/xingmux/Makefile ext/Makefile ext/a52dec/Makefile ext/amrnb/Makefile ext/amrwbdec/Makefile ext/cdio/Makefile ext/dvdread/Makefile ext/mpeg2dec/Makefile ext/sidplay/Makefile ext/x264/Makefile docs/Makefile docs/plugins/Makefile docs/version.entities tests/Makefile tests/check/Makefile tests/files/Makefile m4/Makefile po/Makefile.in pkgconfig/Makefile pkgconfig/gstreamer-plugins-ugly-uninstalled.pc"
cat >confcache <<\_ACEOF
@@ -28008,10 +27529,6 @@
as_fn_error $? "conditional \"HAVE_GST_CHECK\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
-if test -z "${GST_PLUGIN_BUILD_STATIC_TRUE}" && test -z "${GST_PLUGIN_BUILD_STATIC_FALSE}"; then
- as_fn_error $? "conditional \"GST_PLUGIN_BUILD_STATIC\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
if test -z "${USE_PLUGIN_ASFDEMUX_TRUE}" && test -z "${USE_PLUGIN_ASFDEMUX_FALSE}"; then
as_fn_error $? "conditional \"USE_PLUGIN_ASFDEMUX\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -28052,26 +27569,14 @@
as_fn_error $? "conditional \"USE_DVDREAD\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
-if test -z "${USE_LAME_TRUE}" && test -z "${USE_LAME_FALSE}"; then
- as_fn_error $? "conditional \"USE_LAME\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
if test -z "${USE_MPEG2DEC_TRUE}" && test -z "${USE_MPEG2DEC_FALSE}"; then
as_fn_error $? "conditional \"USE_MPEG2DEC\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
-if test -z "${USE_MPG123_TRUE}" && test -z "${USE_MPG123_FALSE}"; then
- as_fn_error $? "conditional \"USE_MPG123\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
if test -z "${USE_SIDPLAY_TRUE}" && test -z "${USE_SIDPLAY_FALSE}"; then
as_fn_error $? "conditional \"USE_SIDPLAY\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
-if test -z "${USE_TWOLAME_TRUE}" && test -z "${USE_TWOLAME_FALSE}"; then
- as_fn_error $? "conditional \"USE_TWOLAME\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
if test -z "${USE_X264_TRUE}" && test -z "${USE_X264_FALSE}"; then
as_fn_error $? "conditional \"USE_X264\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -28096,26 +27601,14 @@
as_fn_error $? "conditional \"USE_DVDREAD\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
-if test -z "${USE_LAME_TRUE}" && test -z "${USE_LAME_FALSE}"; then
- as_fn_error $? "conditional \"USE_LAME\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
if test -z "${USE_MPEG2DEC_TRUE}" && test -z "${USE_MPEG2DEC_FALSE}"; then
as_fn_error $? "conditional \"USE_MPEG2DEC\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
-if test -z "${USE_MPG123_TRUE}" && test -z "${USE_MPG123_FALSE}"; then
- as_fn_error $? "conditional \"USE_MPG123\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
if test -z "${USE_SIDPLAY_TRUE}" && test -z "${USE_SIDPLAY_FALSE}"; then
as_fn_error $? "conditional \"USE_SIDPLAY\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
-if test -z "${USE_TWOLAME_TRUE}" && test -z "${USE_TWOLAME_FALSE}"; then
- as_fn_error $? "conditional \"USE_TWOLAME\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
if test -z "${USE_X264_TRUE}" && test -z "${USE_X264_FALSE}"; then
as_fn_error $? "conditional \"USE_X264\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -28517,7 +28010,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by GStreamer Ugly Plug-ins $as_me 1.12.4, which was
+This file was extended by GStreamer Ugly Plug-ins $as_me 1.13.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -28583,7 +28076,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-GStreamer Ugly Plug-ins config.status 1.12.4
+GStreamer Ugly Plug-ins config.status 1.13.1
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
@@ -29142,11 +28635,8 @@
"ext/amrwbdec/Makefile") CONFIG_FILES="$CONFIG_FILES ext/amrwbdec/Makefile" ;;
"ext/cdio/Makefile") CONFIG_FILES="$CONFIG_FILES ext/cdio/Makefile" ;;
"ext/dvdread/Makefile") CONFIG_FILES="$CONFIG_FILES ext/dvdread/Makefile" ;;
- "ext/lame/Makefile") CONFIG_FILES="$CONFIG_FILES ext/lame/Makefile" ;;
"ext/mpeg2dec/Makefile") CONFIG_FILES="$CONFIG_FILES ext/mpeg2dec/Makefile" ;;
- "ext/mpg123/Makefile") CONFIG_FILES="$CONFIG_FILES ext/mpg123/Makefile" ;;
"ext/sidplay/Makefile") CONFIG_FILES="$CONFIG_FILES ext/sidplay/Makefile" ;;
- "ext/twolame/Makefile") CONFIG_FILES="$CONFIG_FILES ext/twolame/Makefile" ;;
"ext/x264/Makefile") CONFIG_FILES="$CONFIG_FILES ext/x264/Makefile" ;;
"docs/Makefile") CONFIG_FILES="$CONFIG_FILES docs/Makefile" ;;
"docs/plugins/Makefile") CONFIG_FILES="$CONFIG_FILES docs/plugins/Makefile" ;;
diff --git a/configure.ac b/configure.ac
index bedf642..36c3138 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,7 +5,7 @@
dnl initialize autoconf
dnl releases only do -Wall, cvs and prerelease does -Werror too
dnl use a three digit version number for releases, and four for cvs/prerelease
-AC_INIT([GStreamer Ugly Plug-ins],[1.12.4],[http://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer],[gst-plugins-ugly])
+AC_INIT([GStreamer Ugly Plug-ins],[1.13.1],[http://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer],[gst-plugins-ugly])
AG_GST_INIT
@@ -42,11 +42,11 @@
AC_DEFINE_UNQUOTED(GST_API_VERSION, "$GST_API_VERSION",
[GStreamer API Version])
-AS_LIBTOOL(GST, 1204, 0, 1204)
+AS_LIBTOOL(GST, 1301, 0, 1301)
dnl *** required versions of GStreamer stuff ***
-GST_REQ=1.12.0
-GSTPB_REQ=1.12.0
+GST_REQ=1.13.1
+GSTPB_REQ=1.13.1
dnl *** autotools stuff ****
@@ -201,28 +201,6 @@
["${srcdir}/gst-plugins-ugly.doap"],
[$PACKAGE_VERSION_MAJOR.$PACKAGE_VERSION_MINOR.$PACKAGE_VERSION_MICRO])
-dnl build static plugins or not
-AC_MSG_CHECKING([whether to build static plugins or not])
-AC_ARG_ENABLE(
- static-plugins,
- AC_HELP_STRING(
- [--enable-static-plugins],
- [build static plugins @<:@default=no@:>@]),
- [AS_CASE(
- [$enableval], [no], [], [yes], [],
- [AC_MSG_ERROR([bad value "$enableval" for --enable-static-plugins])])],
- [enable_static_plugins=no])
-AC_MSG_RESULT([$enable_static_plugins])
-if test "x$enable_static_plugins" = xyes; then
- AC_DEFINE(GST_PLUGIN_BUILD_STATIC, 1,
- [Define if static plugins should be built])
- GST_PLUGIN_LIBTOOLFLAGS=""
-else
- GST_PLUGIN_LIBTOOLFLAGS="--tag=disable-static"
-fi
-AC_SUBST(GST_PLUGIN_LIBTOOLFLAGS)
-AM_CONDITIONAL(GST_PLUGIN_BUILD_STATIC, test "x$enable_static_plugins" = "xyes")
-
dnl define an ERROR_CFLAGS Makefile variable
AG_GST_SET_ERROR_CFLAGS($FATAL_WARNINGS, [
-Wmissing-declarations -Wmissing-prototypes -Wredundant-decls
@@ -299,57 +277,18 @@
AC_SUBST(DVDREAD_LIBS)
])
-dnl *** lame ***
-translit(dnm, m, l) AM_CONDITIONAL(USE_LAME, true)
-AG_GST_CHECK_FEATURE(LAME, [lame mp3 encoder library], lame, [
- AG_GST_CHECK_LIBHEADER(LAME, mp3lame, lame_init, $LIBM, lame/lame.h,
- [
- HAVE_LAME="yes"
- LAME_LIBS="-lmp3lame $LIBM"
- dnl is lame presets available
- LAME_CFLAGS=""
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <lame/lame.h>]], [[ int preset = MEDIUM ]])],[LAME_CFLAGS="-DGSTLAME_PRESET"],[LAME_CFLAGS=""
- ])
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <lame/lame.h>]], [[
- void *ptr = &lame_set_VBR_quality
- ]])],[LAME_CFLAGS="$LAME_CFLAGS -DHAVE_LAME_SET_VBR_QUALITY"],[LAME_CFLAGS="$LAME_CFLAGS"
- ])
- AC_SUBST(LAME_CFLAGS)
- AC_SUBST(LAME_LIBS)
- ])
-])
-
dnl *** mpeg2dec ***
translit(dnm, m, l) AM_CONDITIONAL(USE_MPEG2DEC, true)
AG_GST_CHECK_FEATURE(MPEG2DEC, [mpeg2dec], mpeg2dec, [
AG_GST_PKG_CHECK_MODULES(MPEG2DEC, libmpeg2 >= 0.5.1)
])
-dnl *** mpg123 ***
-translit(dnm, m, l) AM_CONDITIONAL(USE_MPG123, true)
-AG_GST_CHECK_FEATURE(MPG123, [mpg123 audio decoder], mpg123, [
- PKG_CHECK_MODULES(MPG123, libmpg123 >= 1.13, HAVE_MPG123="yes", HAVE_MPG123="no")
- AC_SUBST(MPG123_CFLAGS)
- AC_SUBST(MPG123_LIBS)
-])
-
dnl *** sidplay : works with libsidplay 1.36.x (not 2.x.x) ***
translit(dnm, m, l) AM_CONDITIONAL(USE_SIDPLAY, true)
AG_GST_CHECK_FEATURE(SIDPLAY, [libsidplay], sid, [
GST_PATH_SIDPLAY()
])
-dnl *** twolame ***
-translit(dnm, m, l) AM_CONDITIONAL(USE_TWOLAME, true)
-AG_GST_CHECK_FEATURE(TWOLAME, [twolame], twolame, [
- PKG_CHECK_MODULES(TWOLAME, twolame >= 0.3.10, [
- HAVE_TWOLAME="yes"], [
- HAVE_TWOLAME="no"
- ])
- AC_SUBST(TWOLAME_CFLAGS)
- AC_SUBST(TWOLAME_LIBS)
-])
-
dnl *** x264 (MPEG-4 part 10/h.264/AVC encoder) ***
translit(dnm, m, l) AM_CONDITIONAL(USE_X264, true)
AG_GST_CHECK_FEATURE(X264, [x264 plug-in], x264, [
@@ -377,11 +316,8 @@
AM_CONDITIONAL(USE_AMRWB, false)
AM_CONDITIONAL(USE_CDIO, false)
AM_CONDITIONAL(USE_DVDREAD, false)
-AM_CONDITIONAL(USE_LAME, false)
AM_CONDITIONAL(USE_MPEG2DEC, false)
-AM_CONDITIONAL(USE_MPG123, false)
AM_CONDITIONAL(USE_SIDPLAY, false)
-AM_CONDITIONAL(USE_TWOLAME, false)
AM_CONDITIONAL(USE_X264, false)
fi dnl of EXT plugins
@@ -410,6 +346,20 @@
fi
AC_SUBST(DEPRECATED_CFLAGS)
+VISIBILITY_CFLAGS=""
+AS_COMPILER_FLAG([-fvisibility=hidden], [VISIBILITY_CFLAGS="-fvisibility=hidden"])
+AC_SUBST(VISIBILITY_CFLAGS)
+
+VISIBILITY_CXXFLAGS=""
+if test "x$HAVE_CXX" = "xyes"; then
+ AS_CXX_COMPILER_FLAG([-fvisibility=hidden], [VISIBILITY_CXXFLAGS="-fvisibility=hidden"])
+fi
+AC_SUBST(VISIBILITY_CXXFLAGS)
+
+dnl disable strict aliasing
+AS_COMPILER_FLAG([-fno-strict-aliasing], [EXTRA_CFLAGS="-fno-strict-aliasing"])
+AC_SUBST(EXTRA_CFLAGS)
+
dnl every flag in GST_OPTION_CFLAGS and GST_OPTION_CXXFLAGS can be overridden
dnl at make time with e.g. make ERROR_CFLAGS=""
GST_OPTION_CFLAGS="\$(WARNING_CFLAGS) \$(ERROR_CFLAGS) \$(DEBUG_CFLAGS) \$(PROFILE_CFLAGS) \$(GCOV_CFLAGS) \$(OPT_CFLAGS) \$(DEPRECATED_CFLAGS)"
@@ -422,8 +372,8 @@
dnl also add builddir include for enumtypes and marshal
dnl add GST_OPTION_CFLAGS, but overridable
GST_CFLAGS="$GST_CFLAGS"
-GST_CXXFLAGS="-I\$(top_srcdir)/gst-libs -I\$(top_builddir)/gst-libs $GST_CFLAGS $GLIB_EXTRA_CFLAGS \$(GST_OPTION_CXXFLAGS)"
-GST_CFLAGS="-I\$(top_srcdir)/gst-libs -I\$(top_builddir)/gst-libs $GST_CFLAGS $GLIB_EXTRA_CFLAGS \$(GST_OPTION_CFLAGS)"
+GST_CXXFLAGS="-I\$(top_srcdir)/gst-libs -I\$(top_builddir)/gst-libs $GST_CFLAGS $EXTRA_CFLAGS $GLIB_EXTRA_CFLAGS \$(GST_OPTION_CXXFLAGS) \$(VISIBILITY_CXXFLAGS)"
+GST_CFLAGS="-I\$(top_srcdir)/gst-libs -I\$(top_builddir)/gst-libs $GST_CFLAGS $EXTRA_CFLAGS $GLIB_EXTRA_CFLAGS \$(GST_OPTION_CFLAGS) \$(VISIBILITY_CFLAGS)"
AC_SUBST(GST_CFLAGS)
AC_SUBST(GST_CXXFLAGS)
AC_SUBST(GST_LIBS)
@@ -438,7 +388,7 @@
dnl this really should only contain flags, not libs - they get added before
dnl whatevertarget_LIBS and -L flags here affect the rest of the linking
-GST_PLUGIN_LDFLAGS="-module -avoid-version -export-symbols-regex '^[_]*gst_plugin_.*' $GST_ALL_LDFLAGS"
+GST_PLUGIN_LDFLAGS="-module -avoid-version $GST_ALL_LDFLAGS"
AC_SUBST(GST_PLUGIN_LDFLAGS)
dnl *** output files ***
@@ -461,11 +411,8 @@
ext/amrwbdec/Makefile
ext/cdio/Makefile
ext/dvdread/Makefile
-ext/lame/Makefile
ext/mpeg2dec/Makefile
-ext/mpg123/Makefile
ext/sidplay/Makefile
-ext/twolame/Makefile
ext/x264/Makefile
docs/Makefile
docs/plugins/Makefile
diff --git a/docs/Makefile.in b/docs/Makefile.in
index 70c6a86..e3a3a98 100644
--- a/docs/Makefile.in
+++ b/docs/Makefile.in
@@ -257,6 +257,7 @@
ERROR_CFLAGS = @ERROR_CFLAGS@
ERROR_CXXFLAGS = @ERROR_CXXFLAGS@
EXEEXT = @EXEEXT@
+EXTRA_CFLAGS = @EXTRA_CFLAGS@
FFLAGS = @FFLAGS@
FGREP = @FGREP@
GCOV = @GCOV@
@@ -308,7 +309,6 @@
GST_PLUGINS_NONPORTED = @GST_PLUGINS_NONPORTED@
GST_PLUGINS_SELECTED = @GST_PLUGINS_SELECTED@
GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
-GST_PLUGIN_LIBTOOLFLAGS = @GST_PLUGIN_LIBTOOLFLAGS@
GST_PREFIX = @GST_PREFIX@
GST_REVISION = @GST_REVISION@
GST_TOOLS_DIR = @GST_TOOLS_DIR@
@@ -319,7 +319,6 @@
GTKDOC_REBASE = @GTKDOC_REBASE@
HAVE_CXX = @HAVE_CXX@
HAVE_DVDREAD = @HAVE_DVDREAD@
-HAVE_LAME = @HAVE_LAME@
HTML_DIR = @HTML_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
@@ -328,8 +327,6 @@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INTLLIBS = @INTLLIBS@
INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-LAME_CFLAGS = @LAME_CFLAGS@
-LAME_LIBS = @LAME_LIBS@
LD = @LD@
LDFLAGS = @LDFLAGS@
LIBICONV = @LIBICONV@
@@ -351,8 +348,6 @@
MKDIR_P = @MKDIR_P@
MPEG2DEC_CFLAGS = @MPEG2DEC_CFLAGS@
MPEG2DEC_LIBS = @MPEG2DEC_LIBS@
-MPG123_CFLAGS = @MPG123_CFLAGS@
-MPG123_LIBS = @MPG123_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_015 = @MSGFMT_015@
MSGMERGE = @MSGMERGE@
@@ -395,13 +390,13 @@
SIDPLAY_CFLAGS = @SIDPLAY_CFLAGS@
SIDPLAY_LIBS = @SIDPLAY_LIBS@
STRIP = @STRIP@
-TWOLAME_CFLAGS = @TWOLAME_CFLAGS@
-TWOLAME_LIBS = @TWOLAME_LIBS@
USE_NLS = @USE_NLS@
VALGRIND_CFLAGS = @VALGRIND_CFLAGS@
VALGRIND_LIBS = @VALGRIND_LIBS@
VALGRIND_PATH = @VALGRIND_PATH@
VERSION = @VERSION@
+VISIBILITY_CFLAGS = @VISIBILITY_CFLAGS@
+VISIBILITY_CXXFLAGS = @VISIBILITY_CXXFLAGS@
WARNING_CFLAGS = @WARNING_CFLAGS@
WARNING_CXXFLAGS = @WARNING_CXXFLAGS@
WIN32_LIBS = @WIN32_LIBS@
diff --git a/docs/plugins/Makefile.am b/docs/plugins/Makefile.am
index 7679fd2..0571c54 100644
--- a/docs/plugins/Makefile.am
+++ b/docs/plugins/Makefile.am
@@ -59,9 +59,7 @@
$(top_srcdir)/ext/amrnb/amrnbenc.h \
$(top_srcdir)/ext/amrwbdec/amrwbdec.h \
$(top_srcdir)/ext/cdio/gstcdiocddasrc.h \
- $(top_srcdir)/ext/lame/gstlamemp3enc.h \
$(top_srcdir)/ext/sidplay/gstsiddec.h \
- $(top_srcdir)/ext/twolame/gsttwolamemp2enc.h \
$(top_srcdir)/ext/x264/gstx264enc.h \
$(top_srcdir)/gst/asfdemux/gstrtspwms.h \
$(top_srcdir)/gst/xingmux/gstxingmux.h \
diff --git a/docs/plugins/Makefile.in b/docs/plugins/Makefile.in
index 1b9a53b..03f2d3f 100644
--- a/docs/plugins/Makefile.in
+++ b/docs/plugins/Makefile.in
@@ -217,6 +217,7 @@
ERROR_CFLAGS = @ERROR_CFLAGS@
ERROR_CXXFLAGS = @ERROR_CXXFLAGS@
EXEEXT = @EXEEXT@
+EXTRA_CFLAGS = @EXTRA_CFLAGS@
FFLAGS = @FFLAGS@
FGREP = @FGREP@
GCOV = @GCOV@
@@ -268,7 +269,6 @@
GST_PLUGINS_NONPORTED = @GST_PLUGINS_NONPORTED@
GST_PLUGINS_SELECTED = @GST_PLUGINS_SELECTED@
GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
-GST_PLUGIN_LIBTOOLFLAGS = @GST_PLUGIN_LIBTOOLFLAGS@
GST_PREFIX = @GST_PREFIX@
GST_REVISION = @GST_REVISION@
GST_TOOLS_DIR = @GST_TOOLS_DIR@
@@ -279,7 +279,6 @@
GTKDOC_REBASE = @GTKDOC_REBASE@
HAVE_CXX = @HAVE_CXX@
HAVE_DVDREAD = @HAVE_DVDREAD@
-HAVE_LAME = @HAVE_LAME@
HTML_DIR = @HTML_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
@@ -288,8 +287,6 @@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INTLLIBS = @INTLLIBS@
INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-LAME_CFLAGS = @LAME_CFLAGS@
-LAME_LIBS = @LAME_LIBS@
LD = @LD@
LDFLAGS = @LDFLAGS@
LIBICONV = @LIBICONV@
@@ -311,8 +308,6 @@
MKDIR_P = @MKDIR_P@
MPEG2DEC_CFLAGS = @MPEG2DEC_CFLAGS@
MPEG2DEC_LIBS = @MPEG2DEC_LIBS@
-MPG123_CFLAGS = @MPG123_CFLAGS@
-MPG123_LIBS = @MPG123_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_015 = @MSGFMT_015@
MSGMERGE = @MSGMERGE@
@@ -355,13 +350,13 @@
SIDPLAY_CFLAGS = @SIDPLAY_CFLAGS@
SIDPLAY_LIBS = @SIDPLAY_LIBS@
STRIP = @STRIP@
-TWOLAME_CFLAGS = @TWOLAME_CFLAGS@
-TWOLAME_LIBS = @TWOLAME_LIBS@
USE_NLS = @USE_NLS@
VALGRIND_CFLAGS = @VALGRIND_CFLAGS@
VALGRIND_LIBS = @VALGRIND_LIBS@
VALGRIND_PATH = @VALGRIND_PATH@
VERSION = @VERSION@
+VISIBILITY_CFLAGS = @VISIBILITY_CFLAGS@
+VISIBILITY_CXXFLAGS = @VISIBILITY_CXXFLAGS@
WARNING_CFLAGS = @WARNING_CFLAGS@
WARNING_CXXFLAGS = @WARNING_CXXFLAGS@
WIN32_LIBS = @WIN32_LIBS@
@@ -497,9 +492,7 @@
$(top_srcdir)/ext/amrnb/amrnbenc.h \
$(top_srcdir)/ext/amrwbdec/amrwbdec.h \
$(top_srcdir)/ext/cdio/gstcdiocddasrc.h \
- $(top_srcdir)/ext/lame/gstlamemp3enc.h \
$(top_srcdir)/ext/sidplay/gstsiddec.h \
- $(top_srcdir)/ext/twolame/gsttwolamemp2enc.h \
$(top_srcdir)/ext/x264/gstx264enc.h \
$(top_srcdir)/gst/asfdemux/gstrtspwms.h \
$(top_srcdir)/gst/xingmux/gstxingmux.h \
diff --git a/docs/plugins/gst-plugins-ugly-plugins-docs.sgml b/docs/plugins/gst-plugins-ugly-plugins-docs.sgml
index a0b4525..2496f92 100644
--- a/docs/plugins/gst-plugins-ugly-plugins-docs.sgml
+++ b/docs/plugins/gst-plugins-ugly-plugins-docs.sgml
@@ -22,15 +22,12 @@
<xi:include href="xml/element-amrnbenc.xml" />
<xi:include href="xml/element-amrwbdec.xml" />
<xi:include href="xml/element-cdiocddasrc.xml" />
- <xi:include href="xml/element-lamemp3enc.xml" />
- <xi:include href="xml/element-mpg123audiodec.xml" />
<xi:include href="xml/element-rademux.xml" />
<xi:include href="xml/element-rmdemux.xml" />
<xi:include href="xml/element-rdtmanager.xml" />
<xi:include href="xml/element-rtspreal.xml" />
<xi:include href="xml/element-rtspwms.xml" />
<xi:include href="xml/element-siddec.xml" />
- <xi:include href="xml/element-twolamemp2enc.xml" />
<xi:include href="xml/element-x264enc.xml" />
<xi:include href="xml/element-xingmux.xml" />
</chapter>
@@ -45,12 +42,9 @@
<xi:include href="xml/plugin-dvdlpcmdec.xml" />
<xi:include href="xml/plugin-dvdread.xml" />
<xi:include href="xml/plugin-dvdsub.xml" />
- <xi:include href="xml/plugin-lame.xml" />
<xi:include href="xml/plugin-mpeg2dec.xml" />
- <xi:include href="xml/plugin-mpg123.xml" />
<xi:include href="xml/plugin-realmedia.xml" />
- <xi:include href="xml/plugin-siddec.xml" />
- <xi:include href="xml/plugin-twolame.xml" />
+ <xi:include href="xml/plugin-sid.xml" />
<xi:include href="xml/plugin-x264.xml" />
</chapter>
</book>
diff --git a/docs/plugins/gst-plugins-ugly-plugins-sections.txt b/docs/plugins/gst-plugins-ugly-plugins-sections.txt
index ec5ffe8..a818d7e 100644
--- a/docs/plugins/gst-plugins-ugly-plugins-sections.txt
+++ b/docs/plugins/gst-plugins-ugly-plugins-sections.txt
@@ -78,35 +78,6 @@
</SECTION>
<SECTION>
-<FILE>element-lamemp3enc</FILE>
-<TITLE>lamemp3enc</TITLE>
-GstLameMP3Enc
-<SUBSECTION Standard>
-GstLameMP3EncClass
-GST_LAMEMP3ENC
-GST_LAMEMP3ENC_CLASS
-GST_IS_LAMEMP3ENC
-GST_IS_LAMEMP3ENC_CLASS
-GST_TYPE_LAMEMP3ENC
-gst_lamemp3enc_get_type
-gst_lamemp3enc_register
-</SECTION>
-
-<SECTION>
-<FILE>element-mpg123audiodec</FILE>
-<TITLE>mpg123audiodec</TITLE>
-GstMpg123AudioDec
-<SUBSECTION Standard>
-GstMpg123AudioDecClass
-GST_MPG123_AUDIO_DEC
-GST_MPG123_AUDIO_DEC_CLASS
-GST_IS_MPG123_AUDIO_DEC
-GST_IS_MPG123_AUDIO_DEC_CLASS
-GST_TYPE_MPG123_AUDIO_DEC
-gst_mpg123_audio_dec_get_type
-</SECTION>
-
-<SECTION>
<FILE>element-rademux</FILE>
<TITLE>rademux</TITLE>
GstRealAudioDemux
@@ -217,21 +188,6 @@
</SECTION>
<SECTION>
-<FILE>element-twolamemp2enc</FILE>
-<TITLE>twolame</TITLE>
-GstTwoLame
-<SUBSECTION Standard>
-GstTwoLameClass
-GST_TWO_LAME
-GST_TWO_LAME_CLASS
-GST_IS_TWO_LAME
-GST_IS_TWO_LAME_CLASS
-GST_TYPE_TWO_LAME
-gst_two_lame_get_type
-</SECTION>
-
-
-<SECTION>
<FILE>element-x264enc</FILE>
<TITLE>x264enc</TITLE>
GstX264Enc
diff --git a/docs/plugins/gst-plugins-ugly-plugins.args b/docs/plugins/gst-plugins-ugly-plugins.args
index a021799..34dc6c1 100644
--- a/docs/plugins/gst-plugins-ugly-plugins.args
+++ b/docs/plugins/gst-plugins-ugly-plugins.args
@@ -139,396 +139,6 @@
</ARG>
<ARG>
-<NAME>GstLame::allow-diff-short</NAME>
-<TYPE>gboolean</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Allow diff short</NICK>
-<BLURB>Allow diff short.</BLURB>
-<DEFAULT>FALSE</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>GstLame::ath-lower</NAME>
-<TYPE>gint</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>ATH lower</NICK>
-<BLURB>lowers ATH by x dB.</BLURB>
-<DEFAULT>3</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>GstLame::ath-only</NAME>
-<TYPE>gboolean</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>ATH only</NICK>
-<BLURB>Ignore GPSYCHO completely, use ATH only.</BLURB>
-<DEFAULT>FALSE</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>GstLame::ath-short</NAME>
-<TYPE>gboolean</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>ATH short</NICK>
-<BLURB>Ignore GPSYCHO for short blocks, use ATH only.</BLURB>
-<DEFAULT>FALSE</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>GstLame::bitrate</NAME>
-<TYPE>gint</TYPE>
-<RANGE>[0,320]</RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Bitrate (kb/s)</NICK>
-<BLURB>Bitrate in kbit/sec (8, 16, 24, 32, 40, 48, 56, 64, 80, 96, 112, 128, 160, 192, 224, 256 or 320).</BLURB>
-<DEFAULT>128</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>GstLame::compression-ratio</NAME>
-<TYPE>gfloat</TYPE>
-<RANGE>[0,200]</RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Compression Ratio</NICK>
-<BLURB>let lame choose bitrate to achieve selected compression ratio.</BLURB>
-<DEFAULT>0</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>GstLame::copyright</NAME>
-<TYPE>gboolean</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Copyright</NICK>
-<BLURB>Mark as copyright.</BLURB>
-<DEFAULT>FALSE</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>GstLame::cwlimit</NAME>
-<TYPE>gint</TYPE>
-<RANGE>[0,50000]</RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Cwlimit</NICK>
-<BLURB>Compute tonality up to freq (in kHz) default 8.8717 (DEPRECATED: this setting has no effect).</BLURB>
-<DEFAULT>0</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>GstLame::disable-reservoir</NAME>
-<TYPE>gboolean</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Disable reservoir</NICK>
-<BLURB>Disable the bit reservoir.</BLURB>
-<DEFAULT>TRUE</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>GstLame::emphasis</NAME>
-<TYPE>gboolean</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Emphasis</NICK>
-<BLURB>Emphasis.</BLURB>
-<DEFAULT>FALSE</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>GstLame::error-protection</NAME>
-<TYPE>gboolean</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Error protection</NICK>
-<BLURB>Adds 16 bit checksum to every frame.</BLURB>
-<DEFAULT>FALSE</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>GstLame::extension</NAME>
-<TYPE>gboolean</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Extension</NICK>
-<BLURB>Extension.</BLURB>
-<DEFAULT>FALSE</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>GstLame::force-ms</NAME>
-<TYPE>gboolean</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Force ms</NICK>
-<BLURB>Force ms_stereo on all frames.</BLURB>
-<DEFAULT>FALSE</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>GstLame::free-format</NAME>
-<TYPE>gboolean</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Free format</NICK>
-<BLURB>Produce a free format bitstream.</BLURB>
-<DEFAULT>FALSE</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>GstLame::highpass-freq</NAME>
-<TYPE>gint</TYPE>
-<RANGE>[0,50000]</RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Highpass freq</NICK>
-<BLURB>frequency(kHz), highpass filter cutoff below freq.</BLURB>
-<DEFAULT>0</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>GstLame::highpass-width</NAME>
-<TYPE>gint</TYPE>
-<RANGE>>= -1</RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Highpass width</NICK>
-<BLURB>frequency(kHz) - default 15% of highpass freq.</BLURB>
-<DEFAULT>-1</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>GstLame::lowpass-freq</NAME>
-<TYPE>gint</TYPE>
-<RANGE>[0,50000]</RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Lowpass freq</NICK>
-<BLURB>frequency(kHz), lowpass filter cutoff above freq.</BLURB>
-<DEFAULT>17000</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>GstLame::lowpass-width</NAME>
-<TYPE>gint</TYPE>
-<RANGE>>= -1</RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Lowpass width</NICK>
-<BLURB>frequency(kHz) - default 15% of lowpass freq.</BLURB>
-<DEFAULT>-1</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>GstLame::mode</NAME>
-<TYPE>GstLameMode</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Mode</NICK>
-<BLURB>Encoding mode.</BLURB>
-<DEFAULT>Joint Stereo</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>GstLame::no-ath</NAME>
-<TYPE>gboolean</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>No ath</NICK>
-<BLURB>turns ATH down to a flat noise floor.</BLURB>
-<DEFAULT>FALSE</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>GstLame::no-short-blocks</NAME>
-<TYPE>gboolean</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>No short blocks</NICK>
-<BLURB>Do not use short blocks.</BLURB>
-<DEFAULT>FALSE</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>GstLame::original</NAME>
-<TYPE>gboolean</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Original</NICK>
-<BLURB>Mark as original.</BLURB>
-<DEFAULT>TRUE</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>GstLame::padding-type</NAME>
-<TYPE>GstLamePadding</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Padding type</NICK>
-<BLURB>Padding type (DEPRECATED: this setting has no effect).</BLURB>
-<DEFAULT>No Padding</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>GstLame::preset</NAME>
-<TYPE>GstLamePreset</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Lame Preset</NICK>
-<BLURB>Lame Preset.</BLURB>
-<DEFAULT>None</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>GstLame::quality</NAME>
-<TYPE>GstLameQuality</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Quality</NICK>
-<BLURB>Quality of algorithm used for encoding.</BLURB>
-<DEFAULT>3</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>GstLame::strict-iso</NAME>
-<TYPE>gboolean</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Strict ISO</NICK>
-<BLURB>Comply as much as possible to ISO MPEG spec.</BLURB>
-<DEFAULT>TRUE</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>GstLame::vbr</NAME>
-<TYPE>GstLameVbrmode</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>VBR</NICK>
-<BLURB>Specify bitrate mode.</BLURB>
-<DEFAULT>No VBR (Constant Bitrate)</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>GstLame::vbr-hard-min</NAME>
-<TYPE>gint</TYPE>
-<RANGE>[0,1]</RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>VBR hard min</NICK>
-<BLURB>Specify whether min VBR bitrate is a hard limit. Normally, it can be violated for silence.</BLURB>
-<DEFAULT>0</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>GstLame::vbr-max-bitrate</NAME>
-<TYPE>gint</TYPE>
-<RANGE>[0,320]</RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>VBR max bitrate</NICK>
-<BLURB>Specify maximum VBR bitrate (8, 16, 24, 32, 40, 48, 56, 64, 80, 96, 112, 128, 160, 192, 224, 256 or 320).</BLURB>
-<DEFAULT>0</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>GstLame::vbr-mean-bitrate</NAME>
-<TYPE>gint</TYPE>
-<RANGE>[0,320]</RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>VBR mean bitrate</NICK>
-<BLURB>Specify mean VBR bitrate.</BLURB>
-<DEFAULT>128</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>GstLame::vbr-min-bitrate</NAME>
-<TYPE>gint</TYPE>
-<RANGE>[0,320]</RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>VBR min bitrate</NICK>
-<BLURB>Specify minimum VBR bitrate (8, 16, 24, 32, 40, 48, 56, 64, 80, 96, 112, 128, 160, 192, 224, 256 or 320).</BLURB>
-<DEFAULT>0</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>GstLame::vbr-quality</NAME>
-<TYPE>GstLameQuality</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>VBR Quality</NICK>
-<BLURB>VBR Quality.</BLURB>
-<DEFAULT>4</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>GstLame::xingheader</NAME>
-<TYPE>gboolean</TYPE>
-<RANGE></RANGE>
-<FLAGS>rw</FLAGS>
-<NICK>Output Xing Header</NICK>
-<BLURB>Output Xing Header (BROKEN, use xingmux instead).</BLURB>
-<DEFAULT>FALSE</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>GstLameMP3Enc::bitrate</NAME>
-<TYPE>gint</TYPE>
-<RANGE>[8,320]</RANGE>
-<FLAGS>rwx</FLAGS>
-<NICK>Bitrate (kb/s)</NICK>
-<BLURB>Bitrate in kbit/sec (Only valid if target is bitrate, for CBR one of 8, 16, 24, 32, 40, 48, 56, 64, 80, 96, 112, 128, 160, 192, 224, 256 or 320).</BLURB>
-<DEFAULT>128</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>GstLameMP3Enc::cbr</NAME>
-<TYPE>gboolean</TYPE>
-<RANGE></RANGE>
-<FLAGS>rwx</FLAGS>
-<NICK>CBR</NICK>
-<BLURB>Enforce constant bitrate encoding (Only valid if target is bitrate).</BLURB>
-<DEFAULT>FALSE</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>GstLameMP3Enc::encoding-engine-quality</NAME>
-<TYPE>GstLameMP3EncEncodingEngineQuality</TYPE>
-<RANGE></RANGE>
-<FLAGS>rwx</FLAGS>
-<NICK>Encoding Engine Quality</NICK>
-<BLURB>Quality/speed of the encoding engine, this does not affect the bitrate!.</BLURB>
-<DEFAULT>Standard</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>GstLameMP3Enc::mono</NAME>
-<TYPE>gboolean</TYPE>
-<RANGE></RANGE>
-<FLAGS>rwx</FLAGS>
-<NICK>Mono</NICK>
-<BLURB>Enforce mono encoding.</BLURB>
-<DEFAULT>FALSE</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>GstLameMP3Enc::quality</NAME>
-<TYPE>gfloat</TYPE>
-<RANGE>[0,9.999]</RANGE>
-<FLAGS>rwx</FLAGS>
-<NICK>Quality</NICK>
-<BLURB>VBR Quality from 0 to 10, 0 being the best (Only valid if target is quality).</BLURB>
-<DEFAULT>4</DEFAULT>
-</ARG>
-
-<ARG>
-<NAME>GstLameMP3Enc::target</NAME>
-<TYPE>GstLameMP3EncTarget</TYPE>
-<RANGE></RANGE>
-<FLAGS>rwx</FLAGS>
-<NICK>Target</NICK>
-<BLURB>Optimize for quality or bitrate.</BLURB>
-<DEFAULT>Quality</DEFAULT>
-</ARG>
-
-<ARG>
<NAME>GstSidDec::blocksize</NAME>
<TYPE>guint</TYPE>
<RANGE>>= 1</RANGE>
@@ -811,7 +421,7 @@
<ARG>
<NAME>GstX264Enc::bframes</NAME>
<TYPE>guint</TYPE>
-<RANGE><= 4</RANGE>
+<RANGE><= 16</RANGE>
<FLAGS>rw</FLAGS>
<NICK>B-Frames</NICK>
<BLURB>Number of B-frames between I and P.</BLURB>
@@ -1169,6 +779,16 @@
</ARG>
<ARG>
+<NAME>GstX264Enc::insert-vui</NAME>
+<TYPE>gboolean</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Insert VUI</NICK>
+<BLURB>Insert VUI NAL in stream.</BLURB>
+<DEFAULT>TRUE</DEFAULT>
+</ARG>
+
+<ARG>
<NAME>GstMad::half</NAME>
<TYPE>gboolean</TYPE>
<RANGE></RANGE>
diff --git a/docs/plugins/gst-plugins-ugly-plugins.hierarchy b/docs/plugins/gst-plugins-ugly-plugins.hierarchy
index b68dd79..c3f2876 100644
--- a/docs/plugins/gst-plugins-ugly-plugins.hierarchy
+++ b/docs/plugins/gst-plugins-ugly-plugins.hierarchy
@@ -14,11 +14,8 @@
GstAmrnbDec
GstAmrwbDec
GstDvdLpcmDec
- GstMpg123AudioDec
GstAudioEncoder
GstAmrnbEnc
- GstLameMP3Enc
- GstTwoLame
GstBaseSrc
GstPushSrc
GstAudioCdSrc
diff --git a/docs/plugins/gst-plugins-ugly-plugins.interfaces b/docs/plugins/gst-plugins-ugly-plugins.interfaces
index 11ef369..fe0f435 100644
--- a/docs/plugins/gst-plugins-ugly-plugins.interfaces
+++ b/docs/plugins/gst-plugins-ugly-plugins.interfaces
@@ -5,8 +5,6 @@
GstCddaBaseSrc GstURIHandler
GstCdioCddaSrc GstURIHandler
GstDvdReadSrc GstURIHandler
-GstLame GstTagSetter GstPreset
-GstLameMP3Enc GstPreset
GstPNMSrc GstURIHandler
GstPipeline GstChildProxy
GstRTSPReal GstRTSPExtension
diff --git a/docs/plugins/html/ch01.html b/docs/plugins/html/ch01.html
index 0f64d60..2bc7d97 100644
--- a/docs/plugins/html/ch01.html
+++ b/docs/plugins/html/ch01.html
@@ -8,7 +8,7 @@
<link rel="up" href="index.html" title="GStreamer Ugly Plugins 1.0 Plugins Reference Manual">
<link rel="prev" href="index.html" title="GStreamer Ugly Plugins 1.0 Plugins Reference Manual">
<link rel="next" href="gst-plugins-ugly-plugins-a52dec.html" title="a52dec">
-<meta name="generator" content="GTK-Doc V1.26 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.27 (XML mode)">
<link rel="stylesheet" href="style.css" type="text/css">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -39,12 +39,6 @@
<span class="refentrytitle"><a href="gst-plugins-ugly-plugins-cdiocddasrc.html">cdiocddasrc</a></span><span class="refpurpose"></span>
</dt>
<dt>
-<span class="refentrytitle"><a href="gst-plugins-ugly-plugins-lamemp3enc.html">lamemp3enc</a></span><span class="refpurpose"></span>
-</dt>
-<dt>
-<span class="refentrytitle"><a href="gst-plugins-ugly-plugins-mpg123audiodec.html">mpg123audiodec</a></span><span class="refpurpose"></span>
-</dt>
-<dt>
<span class="refentrytitle"><a href="gst-plugins-ugly-plugins-rademux.html">rademux</a></span><span class="refpurpose"></span>
</dt>
<dt>
@@ -63,9 +57,6 @@
<span class="refentrytitle"><a href="gst-plugins-ugly-plugins-siddec.html">siddec</a></span><span class="refpurpose"></span>
</dt>
<dt>
-<span class="refentrytitle"><a href="gst-plugins-ugly-plugins-twolame.html">twolame</a></span><span class="refpurpose"></span>
-</dt>
-<dt>
<span class="refentrytitle"><a href="gst-plugins-ugly-plugins-x264enc.html">x264enc</a></span><span class="refpurpose"></span>
</dt>
<dt>
@@ -74,6 +65,6 @@
</dl></div>
</div>
<div class="footer">
-<hr>Generated by GTK-Doc V1.26</div>
+<hr>Generated by GTK-Doc V1.27</div>
</body>
</html>
\ No newline at end of file
diff --git a/docs/plugins/html/ch02.html b/docs/plugins/html/ch02.html
index 65868aa..ed1fd08 100644
--- a/docs/plugins/html/ch02.html
+++ b/docs/plugins/html/ch02.html
@@ -8,7 +8,7 @@
<link rel="up" href="index.html" title="GStreamer Ugly Plugins 1.0 Plugins Reference Manual">
<link rel="prev" href="gst-plugins-ugly-plugins-xingmux.html" title="xingmux">
<link rel="next" href="gst-plugins-ugly-plugins-plugin-a52dec.html" title="a52dec">
-<meta name="generator" content="GTK-Doc V1.26 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.27 (XML mode)">
<link rel="stylesheet" href="style.css" type="text/css">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -48,22 +48,13 @@
<span class="refentrytitle"><a href="gst-plugins-ugly-plugins-plugin-dvdsub.html">dvdsub</a></span><span class="refpurpose"> — DVD subtitle parser and decoder</span>
</dt>
<dt>
-<span class="refentrytitle"><a href="gst-plugins-ugly-plugins-plugin-lame.html">lame</a></span><span class="refpurpose"> — Encode MP3s with LAME</span>
-</dt>
-<dt>
<span class="refentrytitle"><a href="gst-plugins-ugly-plugins-plugin-mpeg2dec.html">mpeg2dec</a></span><span class="refpurpose"> — LibMpeg2 decoder</span>
</dt>
<dt>
-<span class="refentrytitle"><a href="gst-plugins-ugly-plugins-plugin-mpg123.html">mpg123</a></span><span class="refpurpose"> — mp3 decoding based on the mpg123 library</span>
-</dt>
-<dt>
<span class="refentrytitle"><a href="gst-plugins-ugly-plugins-plugin-realmedia.html">realmedia</a></span><span class="refpurpose"> — RealMedia support plugins</span>
</dt>
<dt>
-<span class="refentrytitle"><a href="gst-plugins-ugly-plugins-plugin-siddec.html">siddec</a></span><span class="refpurpose"> — Uses libsidplay to decode .sid files</span>
-</dt>
-<dt>
-<span class="refentrytitle"><a href="gst-plugins-ugly-plugins-plugin-twolame.html">twolame</a></span><span class="refpurpose"> — Encode MP2s with TwoLAME</span>
+<span class="refentrytitle"><a href="gst-plugins-ugly-plugins-plugin-sid.html">sid</a></span><span class="refpurpose"> — Uses libsidplay to decode .sid files</span>
</dt>
<dt>
<span class="refentrytitle"><a href="gst-plugins-ugly-plugins-plugin-x264.html">x264</a></span><span class="refpurpose"> — libx264-based H264 plugins</span>
@@ -71,6 +62,6 @@
</dl></div>
</div>
<div class="footer">
-<hr>Generated by GTK-Doc V1.26</div>
+<hr>Generated by GTK-Doc V1.27</div>
</body>
</html>
\ No newline at end of file
diff --git a/docs/plugins/html/gst-plugins-ugly-plugins-1.0.devhelp2 b/docs/plugins/html/gst-plugins-ugly-plugins-1.0.devhelp2
index 91a18cb..3053d17 100644
--- a/docs/plugins/html/gst-plugins-ugly-plugins-1.0.devhelp2
+++ b/docs/plugins/html/gst-plugins-ugly-plugins-1.0.devhelp2
@@ -7,15 +7,12 @@
<sub name="amrnbenc" link="gst-plugins-ugly-plugins-amrnbenc.html"/>
<sub name="amrwbdec" link="gst-plugins-ugly-plugins-amrwbdec.html"/>
<sub name="cdiocddasrc" link="gst-plugins-ugly-plugins-cdiocddasrc.html"/>
- <sub name="lamemp3enc" link="gst-plugins-ugly-plugins-lamemp3enc.html"/>
- <sub name="mpg123audiodec" link="gst-plugins-ugly-plugins-mpg123audiodec.html"/>
<sub name="rademux" link="gst-plugins-ugly-plugins-rademux.html"/>
<sub name="rmdemux" link="gst-plugins-ugly-plugins-rmdemux.html"/>
<sub name="rdtmanager" link="gst-plugins-ugly-plugins-rdtmanager.html"/>
<sub name="rtspreal" link="gst-plugins-ugly-plugins-rtspreal.html"/>
<sub name="rtspwms" link="gst-plugins-ugly-plugins-rtspwms.html"/>
<sub name="siddec" link="gst-plugins-ugly-plugins-siddec.html"/>
- <sub name="twolame" link="gst-plugins-ugly-plugins-twolame.html"/>
<sub name="x264enc" link="gst-plugins-ugly-plugins-x264enc.html"/>
<sub name="xingmux" link="gst-plugins-ugly-plugins-xingmux.html"/>
</sub>
@@ -28,12 +25,9 @@
<sub name="dvdlpcmdec" link="gst-plugins-ugly-plugins-plugin-dvdlpcmdec.html"/>
<sub name="dvdread" link="gst-plugins-ugly-plugins-plugin-dvdread.html"/>
<sub name="dvdsub" link="gst-plugins-ugly-plugins-plugin-dvdsub.html"/>
- <sub name="lame" link="gst-plugins-ugly-plugins-plugin-lame.html"/>
<sub name="mpeg2dec" link="gst-plugins-ugly-plugins-plugin-mpeg2dec.html"/>
- <sub name="mpg123" link="gst-plugins-ugly-plugins-plugin-mpg123.html"/>
<sub name="realmedia" link="gst-plugins-ugly-plugins-plugin-realmedia.html"/>
- <sub name="siddec" link="gst-plugins-ugly-plugins-plugin-siddec.html"/>
- <sub name="twolame" link="gst-plugins-ugly-plugins-plugin-twolame.html"/>
+ <sub name="sid" link="gst-plugins-ugly-plugins-plugin-sid.html"/>
<sub name="x264" link="gst-plugins-ugly-plugins-plugin-x264.html"/>
</sub>
</chapters>
@@ -49,14 +43,6 @@
<keyword type="struct" name="struct GstAmrwbDec" link="gst-plugins-ugly-plugins-amrwbdec.html#GstAmrwbDec-struct"/>
<keyword type="struct" name="struct GstCdioCddaSrc" link="gst-plugins-ugly-plugins-cdiocddasrc.html#GstCdioCddaSrc-struct"/>
<keyword type="property" name="The “read-speed” property" link="gst-plugins-ugly-plugins-cdiocddasrc.html#GstCdioCddaSrc--read-speed"/>
- <keyword type="struct" name="struct GstLameMP3Enc" link="gst-plugins-ugly-plugins-lamemp3enc.html#GstLameMP3Enc-struct"/>
- <keyword type="property" name="The “bitrate” property" link="gst-plugins-ugly-plugins-lamemp3enc.html#GstLameMP3Enc--bitrate"/>
- <keyword type="property" name="The “cbr” property" link="gst-plugins-ugly-plugins-lamemp3enc.html#GstLameMP3Enc--cbr"/>
- <keyword type="property" name="The “encoding-engine-quality” property" link="gst-plugins-ugly-plugins-lamemp3enc.html#GstLameMP3Enc--encoding-engine-quality"/>
- <keyword type="property" name="The “mono” property" link="gst-plugins-ugly-plugins-lamemp3enc.html#GstLameMP3Enc--mono"/>
- <keyword type="property" name="The “quality” property" link="gst-plugins-ugly-plugins-lamemp3enc.html#GstLameMP3Enc--quality"/>
- <keyword type="property" name="The “target” property" link="gst-plugins-ugly-plugins-lamemp3enc.html#GstLameMP3Enc--target"/>
- <keyword type="struct" name="struct GstMpg123AudioDec" link="gst-plugins-ugly-plugins-mpg123audiodec.html#GstMpg123AudioDec-struct"/>
<keyword type="struct" name="struct GstRealAudioDemux" link="gst-plugins-ugly-plugins-rademux.html#GstRealAudioDemux-struct"/>
<keyword type="struct" name="struct GstRMDemux" link="gst-plugins-ugly-plugins-rmdemux.html#GstRMDemux-struct"/>
<keyword type="struct" name="struct GstRDTManager" link="gst-plugins-ugly-plugins-rdtmanager.html#GstRDTManager-struct"/>
@@ -79,22 +65,6 @@
<keyword type="property" name="The “metadata” property" link="gst-plugins-ugly-plugins-siddec.html#GstSidDec--metadata"/>
<keyword type="property" name="The “mos8580” property" link="gst-plugins-ugly-plugins-siddec.html#GstSidDec--mos8580"/>
<keyword type="property" name="The “tune” property" link="gst-plugins-ugly-plugins-siddec.html#GstSidDec--tune"/>
- <keyword type="struct" name="struct GstTwoLame" link="gst-plugins-ugly-plugins-twolame.html#GstTwoLame-struct"/>
- <keyword type="property" name="The “ath-level” property" link="gst-plugins-ugly-plugins-twolame.html#GstTwoLame--ath-level"/>
- <keyword type="property" name="The “bitrate” property" link="gst-plugins-ugly-plugins-twolame.html#GstTwoLame--bitrate"/>
- <keyword type="property" name="The “copyright” property" link="gst-plugins-ugly-plugins-twolame.html#GstTwoLame--copyright"/>
- <keyword type="property" name="The “emphasis” property" link="gst-plugins-ugly-plugins-twolame.html#GstTwoLame--emphasis"/>
- <keyword type="property" name="The “energy-level-extension” property" link="gst-plugins-ugly-plugins-twolame.html#GstTwoLame--energy-level-extension"/>
- <keyword type="property" name="The “error-protection” property" link="gst-plugins-ugly-plugins-twolame.html#GstTwoLame--error-protection"/>
- <keyword type="property" name="The “mode” property" link="gst-plugins-ugly-plugins-twolame.html#GstTwoLame--mode"/>
- <keyword type="property" name="The “original” property" link="gst-plugins-ugly-plugins-twolame.html#GstTwoLame--original"/>
- <keyword type="property" name="The “padding” property" link="gst-plugins-ugly-plugins-twolame.html#GstTwoLame--padding"/>
- <keyword type="property" name="The “psymodel” property" link="gst-plugins-ugly-plugins-twolame.html#GstTwoLame--psymodel"/>
- <keyword type="property" name="The “quick-mode” property" link="gst-plugins-ugly-plugins-twolame.html#GstTwoLame--quick-mode"/>
- <keyword type="property" name="The “quick-mode-count” property" link="gst-plugins-ugly-plugins-twolame.html#GstTwoLame--quick-mode-count"/>
- <keyword type="property" name="The “vbr” property" link="gst-plugins-ugly-plugins-twolame.html#GstTwoLame--vbr"/>
- <keyword type="property" name="The “vbr-level” property" link="gst-plugins-ugly-plugins-twolame.html#GstTwoLame--vbr-level"/>
- <keyword type="property" name="The “vbr-max-bitrate” property" link="gst-plugins-ugly-plugins-twolame.html#GstTwoLame--vbr-max-bitrate"/>
<keyword type="struct" name="struct GstX264Enc" link="gst-plugins-ugly-plugins-x264enc.html#GstX264Enc-struct"/>
<keyword type="property" name="The “analyse” property" link="gst-plugins-ugly-plugins-x264enc.html#GstX264Enc--analyse"/>
<keyword type="property" name="The “aud” property" link="gst-plugins-ugly-plugins-x264enc.html#GstX264Enc--aud"/>
@@ -136,6 +106,7 @@
<keyword type="property" name="The “speed-preset” property" link="gst-plugins-ugly-plugins-x264enc.html#GstX264Enc--speed-preset"/>
<keyword type="property" name="The “tune” property" link="gst-plugins-ugly-plugins-x264enc.html#GstX264Enc--tune"/>
<keyword type="property" name="The “frame-packing” property" link="gst-plugins-ugly-plugins-x264enc.html#GstX264Enc--frame-packing"/>
+ <keyword type="property" name="The “insert-vui” property" link="gst-plugins-ugly-plugins-x264enc.html#GstX264Enc--insert-vui"/>
<keyword type="struct" name="struct GstXingMux" link="gst-plugins-ugly-plugins-xingmux.html#GstXingMux-struct"/>
</functions>
</book>
diff --git a/docs/plugins/html/gst-plugins-ugly-plugins-a52dec.html b/docs/plugins/html/gst-plugins-ugly-plugins-a52dec.html
index e3a880a..f79dd32 100644
--- a/docs/plugins/html/gst-plugins-ugly-plugins-a52dec.html
+++ b/docs/plugins/html/gst-plugins-ugly-plugins-a52dec.html
@@ -8,7 +8,7 @@
<link rel="up" href="ch01.html" title="gst-plugins-ugly Elements">
<link rel="prev" href="ch01.html" title="gst-plugins-ugly Elements">
<link rel="next" href="gst-plugins-ugly-plugins-amrnbdec.html" title="amrnbdec">
-<meta name="generator" content="GTK-Doc V1.26 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.27 (XML mode)">
<link rel="stylesheet" href="style.css" type="text/css">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -239,6 +239,6 @@
</div>
</div>
<div class="footer">
-<hr>Generated by GTK-Doc V1.26</div>
+<hr>Generated by GTK-Doc V1.27</div>
</body>
</html>
\ No newline at end of file
diff --git a/docs/plugins/html/gst-plugins-ugly-plugins-amrnbdec.html b/docs/plugins/html/gst-plugins-ugly-plugins-amrnbdec.html
index 056cb41..bb5a0cf 100644
--- a/docs/plugins/html/gst-plugins-ugly-plugins-amrnbdec.html
+++ b/docs/plugins/html/gst-plugins-ugly-plugins-amrnbdec.html
@@ -8,7 +8,7 @@
<link rel="up" href="ch01.html" title="gst-plugins-ugly Elements">
<link rel="prev" href="gst-plugins-ugly-plugins-a52dec.html" title="a52dec">
<link rel="next" href="gst-plugins-ugly-plugins-amrnbenc.html" title="amrnbenc">
-<meta name="generator" content="GTK-Doc V1.26 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.27 (XML mode)">
<link rel="stylesheet" href="style.css" type="text/css">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -193,10 +193,10 @@
</div>
<div class="refsect1">
<a name="gst-plugins-ugly-plugins-amrnbdec.see-also"></a><h2>See Also</h2>
-<p><a class="link" href="gst-plugins-ugly-plugins-amrnbenc.html#GstAmrnbEnc"><span class="type">GstAmrnbEnc</span></a>, <a href="/usr/share/gtk-doc/html/gst-plugins-good-plugins-1.0/gst-plugins-good-plugins-amrparse.html#GstAmrParse-struct"><span class="type">GstAmrParse</span></a></p>
+<p><a class="link" href="gst-plugins-ugly-plugins-amrnbenc.html#GstAmrnbEnc"><span class="type">GstAmrnbEnc</span></a>, <span class="type">GstAmrParse</span></p>
</div>
</div>
<div class="footer">
-<hr>Generated by GTK-Doc V1.26</div>
+<hr>Generated by GTK-Doc V1.27</div>
</body>
</html>
\ No newline at end of file
diff --git a/docs/plugins/html/gst-plugins-ugly-plugins-amrnbenc.html b/docs/plugins/html/gst-plugins-ugly-plugins-amrnbenc.html
index 78a2937..a285fc8 100644
--- a/docs/plugins/html/gst-plugins-ugly-plugins-amrnbenc.html
+++ b/docs/plugins/html/gst-plugins-ugly-plugins-amrnbenc.html
@@ -8,7 +8,7 @@
<link rel="up" href="ch01.html" title="gst-plugins-ugly Elements">
<link rel="prev" href="gst-plugins-ugly-plugins-amrnbdec.html" title="amrnbdec">
<link rel="next" href="gst-plugins-ugly-plugins-amrwbdec.html" title="amrwbdec">
-<meta name="generator" content="GTK-Doc V1.26 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.27 (XML mode)">
<link rel="stylesheet" href="style.css" type="text/css">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -206,6 +206,6 @@
</div>
</div>
<div class="footer">
-<hr>Generated by GTK-Doc V1.26</div>
+<hr>Generated by GTK-Doc V1.27</div>
</body>
</html>
\ No newline at end of file
diff --git a/docs/plugins/html/gst-plugins-ugly-plugins-amrwbdec.html b/docs/plugins/html/gst-plugins-ugly-plugins-amrwbdec.html
index 1d05f87..25819dc 100644
--- a/docs/plugins/html/gst-plugins-ugly-plugins-amrwbdec.html
+++ b/docs/plugins/html/gst-plugins-ugly-plugins-amrwbdec.html
@@ -8,7 +8,7 @@
<link rel="up" href="ch01.html" title="gst-plugins-ugly Elements">
<link rel="prev" href="gst-plugins-ugly-plugins-amrnbenc.html" title="amrnbenc">
<link rel="next" href="gst-plugins-ugly-plugins-cdiocddasrc.html" title="cdiocddasrc">
-<meta name="generator" content="GTK-Doc V1.26 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.27 (XML mode)">
<link rel="stylesheet" href="style.css" type="text/css">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -172,6 +172,6 @@
</div>
</div>
<div class="footer">
-<hr>Generated by GTK-Doc V1.26</div>
+<hr>Generated by GTK-Doc V1.27</div>
</body>
</html>
\ No newline at end of file
diff --git a/docs/plugins/html/gst-plugins-ugly-plugins-cdiocddasrc.html b/docs/plugins/html/gst-plugins-ugly-plugins-cdiocddasrc.html
index 83ef760..3a2ce6f 100644
--- a/docs/plugins/html/gst-plugins-ugly-plugins-cdiocddasrc.html
+++ b/docs/plugins/html/gst-plugins-ugly-plugins-cdiocddasrc.html
@@ -7,8 +7,8 @@
<link rel="home" href="index.html" title="GStreamer Ugly Plugins 1.0 Plugins Reference Manual">
<link rel="up" href="ch01.html" title="gst-plugins-ugly Elements">
<link rel="prev" href="gst-plugins-ugly-plugins-amrwbdec.html" title="amrwbdec">
-<link rel="next" href="gst-plugins-ugly-plugins-lamemp3enc.html" title="lamemp3enc">
-<meta name="generator" content="GTK-Doc V1.26 (XML mode)">
+<link rel="next" href="gst-plugins-ugly-plugins-rademux.html" title="rademux">
+<meta name="generator" content="GTK-Doc V1.27 (XML mode)">
<link rel="stylesheet" href="style.css" type="text/css">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -23,7 +23,7 @@
<td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
<td><a accesskey="u" href="ch01.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
<td><a accesskey="p" href="gst-plugins-ugly-plugins-amrwbdec.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
-<td><a accesskey="n" href="gst-plugins-ugly-plugins-lamemp3enc.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
+<td><a accesskey="n" href="gst-plugins-ugly-plugins-rademux.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
</tr></table>
<div class="refentry">
<a name="gst-plugins-ugly-plugins-cdiocddasrc"></a><div class="titlepage"></div>
@@ -218,6 +218,6 @@
</div>
</div>
<div class="footer">
-<hr>Generated by GTK-Doc V1.26</div>
+<hr>Generated by GTK-Doc V1.27</div>
</body>
</html>
\ No newline at end of file
diff --git a/docs/plugins/html/gst-plugins-ugly-plugins-lamemp3enc.html b/docs/plugins/html/gst-plugins-ugly-plugins-lamemp3enc.html
deleted file mode 100644
index a6150b4..0000000
--- a/docs/plugins/html/gst-plugins-ugly-plugins-lamemp3enc.html
+++ /dev/null
@@ -1,339 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>lamemp3enc: GStreamer Ugly Plugins 1.0 Plugins Reference Manual</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.79.1">
-<link rel="home" href="index.html" title="GStreamer Ugly Plugins 1.0 Plugins Reference Manual">
-<link rel="up" href="ch01.html" title="gst-plugins-ugly Elements">
-<link rel="prev" href="gst-plugins-ugly-plugins-cdiocddasrc.html" title="cdiocddasrc">
-<link rel="next" href="gst-plugins-ugly-plugins-mpg123audiodec.html" title="mpg123audiodec">
-<meta name="generator" content="GTK-Doc V1.26 (XML mode)">
-<link rel="stylesheet" href="style.css" type="text/css">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
-<td width="100%" align="left" class="shortcuts">
-<a href="#" class="shortcut">Top</a><span id="nav_description"> <span class="dim">|</span>
- <a href="#gst-plugins-ugly-plugins-lamemp3enc.description" class="shortcut">Description</a></span><span id="nav_hierarchy"> <span class="dim">|</span>
- <a href="#gst-plugins-ugly-plugins-lamemp3enc.object-hierarchy" class="shortcut">Object Hierarchy</a></span><span id="nav_interfaces"> <span class="dim">|</span>
- <a href="#gst-plugins-ugly-plugins-lamemp3enc.implemented-interfaces" class="shortcut">Implemented Interfaces</a></span><span id="nav_properties"> <span class="dim">|</span>
- <a href="#gst-plugins-ugly-plugins-lamemp3enc.properties" class="shortcut">Properties</a></span>
-</td>
-<td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
-<td><a accesskey="u" href="ch01.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
-<td><a accesskey="p" href="gst-plugins-ugly-plugins-cdiocddasrc.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
-<td><a accesskey="n" href="gst-plugins-ugly-plugins-mpg123audiodec.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
-</tr></table>
-<div class="refentry">
-<a name="gst-plugins-ugly-plugins-lamemp3enc"></a><div class="titlepage"></div>
-<div class="refnamediv"><table width="100%"><tr>
-<td valign="top">
-<h2><span class="refentrytitle"><a name="gst-plugins-ugly-plugins-lamemp3enc.top_of_page"></a>lamemp3enc</span></h2>
-<p>lamemp3enc</p>
-</td>
-<td class="gallery_image" valign="top" align="right"></td>
-</tr></table></div>
-<div class="refsect1">
-<a name="gst-plugins-ugly-plugins-lamemp3enc.properties"></a><h2>Properties</h2>
-<div class="informaltable"><table class="informaltable" border="0">
-<colgroup>
-<col width="150px" class="properties_type">
-<col width="300px" class="properties_name">
-<col width="200px" class="properties_flags">
-</colgroup>
-<tbody>
-<tr>
-<td class="property_type"><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"><span class="type">gint</span></a></td>
-<td class="property_name"><a class="link" href="gst-plugins-ugly-plugins-lamemp3enc.html#GstLameMP3Enc--bitrate" title="The “bitrate” property">bitrate</a></td>
-<td class="property_flags">Read / Write / Construct</td>
-</tr>
-<tr>
-<td class="property_type"><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a></td>
-<td class="property_name"><a class="link" href="gst-plugins-ugly-plugins-lamemp3enc.html#GstLameMP3Enc--cbr" title="The “cbr” property">cbr</a></td>
-<td class="property_flags">Read / Write / Construct</td>
-</tr>
-<tr>
-<td class="property_type"><span class="type">GstLameMP3EncEncodingEngineQuality</span></td>
-<td class="property_name"><a class="link" href="gst-plugins-ugly-plugins-lamemp3enc.html#GstLameMP3Enc--encoding-engine-quality" title="The “encoding-engine-quality” property">encoding-engine-quality</a></td>
-<td class="property_flags">Read / Write / Construct</td>
-</tr>
-<tr>
-<td class="property_type"><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a></td>
-<td class="property_name"><a class="link" href="gst-plugins-ugly-plugins-lamemp3enc.html#GstLameMP3Enc--mono" title="The “mono” property">mono</a></td>
-<td class="property_flags">Read / Write / Construct</td>
-</tr>
-<tr>
-<td class="property_type"><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gfloat"><span class="type">gfloat</span></a></td>
-<td class="property_name"><a class="link" href="gst-plugins-ugly-plugins-lamemp3enc.html#GstLameMP3Enc--quality" title="The “quality” property">quality</a></td>
-<td class="property_flags">Read / Write / Construct</td>
-</tr>
-<tr>
-<td class="property_type"><span class="type">GstLameMP3EncTarget</span></td>
-<td class="property_name"><a class="link" href="gst-plugins-ugly-plugins-lamemp3enc.html#GstLameMP3Enc--target" title="The “target” property">target</a></td>
-<td class="property_flags">Read / Write / Construct</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<a name="GstLameMP3Enc"></a><div class="refsect1">
-<a name="gst-plugins-ugly-plugins-lamemp3enc.other"></a><h2>Types and Values</h2>
-<div class="informaltable"><table class="informaltable" width="100%" border="0">
-<colgroup>
-<col width="150px" class="name">
-<col class="description">
-</colgroup>
-<tbody><tr>
-<td class="datatype_keyword">struct</td>
-<td class="function_name"><a class="link" href="gst-plugins-ugly-plugins-lamemp3enc.html#GstLameMP3Enc-struct" title="struct GstLameMP3Enc">GstLameMP3Enc</a></td>
-</tr></tbody>
-</table></div>
-</div>
-<div class="refsect1">
-<a name="gst-plugins-ugly-plugins-lamemp3enc.object-hierarchy"></a><h2>Object Hierarchy</h2>
-<pre class="screen"> <a href="/usr/share/gtk-doc/html/gobject/gobject-The-Base-Object-Type.html#GObject-struct">GObject</a>
- <span class="lineart">╰──</span> <a href="/usr/share/gtk-doc/html/gobject/gobject-The-Base-Object-Type.html#GInitiallyUnowned">GInitiallyUnowned</a>
- <span class="lineart">╰──</span> <a href="/usr/share/gtk-doc/html/gstreamer-1.0/GstObject.html#GstObject-struct">GstObject</a>
- <span class="lineart">╰──</span> <a href="/usr/share/gtk-doc/html/gstreamer-1.0/GstElement.html#GstElement-struct">GstElement</a>
- <span class="lineart">╰──</span> <a href="/usr/share/gtk-doc/html/gst-plugins-base-libs-1.0/GstAudioEncoder.html#GstAudioEncoder-struct">GstAudioEncoder</a>
- <span class="lineart">╰──</span> GstLameMP3Enc
-</pre>
-</div>
-<div class="refsect1">
-<a name="gst-plugins-ugly-plugins-lamemp3enc.implemented-interfaces"></a><h2>Implemented Interfaces</h2>
-<p>
-GstLameMP3Enc implements
- <a href="/usr/share/gtk-doc/html/gstreamer-1.0/GstPreset.html#GstPreset-struct">GstPreset</a>.</p>
-</div>
-<div class="refsect1">
-<a name="gst-plugins-ugly-plugins-lamemp3enc.description"></a><h2>Description</h2>
-<p>This element encodes raw integer audio into an MPEG-1 layer 3 (MP3) stream.
-Note that <a class="ulink" href="http://en.wikipedia.org/wiki/MP3" target="_top">MP3</a> is not
-a free format, there are licensing and patent issues to take into
-consideration. See <a class="ulink" href="http://www.vorbis.com/" target="_top">Ogg/Vorbis</a>
-for a royalty free (and often higher quality) alternative.</p>
-<div class="refsect2">
-<a name="id-1.2.7.8.3"></a><h3>Output sample rate</h3>
-If no fixed output sample rate is negotiated on the element's src pad,
-the element will choose an optimal sample rate to resample to internally.
-For example, a 16-bit 44.1 KHz mono audio stream encoded at 48 kbit will
-get resampled to 32 KHz. Use filter caps on the src pad to force a
-particular sample rate.
-</div>
-<hr>
-<div class="refsect2">
-<a name="id-1.2.7.8.4"></a><h3>Example pipelines</h3>
-<div class="informalexample">
- <table class="listing_frame" border="0" cellpadding="0" cellspacing="0">
- <tbody>
- <tr>
- <td class="listing_lines" align="right"><pre>1</pre></td>
- <td class="listing_code"><pre class="programlisting">gst<span class="gtkdoc opt">-</span>launch<span class="gtkdoc opt">-</span><span class="number">1.0</span> <span class="gtkdoc opt">-</span>v audiotestsrc wave<span class="gtkdoc opt">=</span>sine num<span class="gtkdoc opt">-</span>buffers<span class="gtkdoc opt">=</span><span class="number">100</span> <span class="gtkdoc opt">!</span> audioconvert <span class="gtkdoc opt">!</span> lamemp3enc <span class="gtkdoc opt">!</span> filesink location<span class="gtkdoc opt">=</span>sine<span class="gtkdoc opt">.</span>mp3</pre></td>
- </tr>
- </tbody>
- </table>
-</div>
- Encode a test sine signal to MP3.
-<div class="informalexample">
- <table class="listing_frame" border="0" cellpadding="0" cellspacing="0">
- <tbody>
- <tr>
- <td class="listing_lines" align="right"><pre>1</pre></td>
- <td class="listing_code"><pre class="programlisting">gst<span class="gtkdoc opt">-</span>launch<span class="gtkdoc opt">-</span><span class="number">1.0</span> <span class="gtkdoc opt">-</span>v autoaudiosrc <span class="gtkdoc opt">!</span> audioconvert <span class="gtkdoc opt">!</span> lamemp3enc target<span class="gtkdoc opt">=</span>bitrate bitrate<span class="gtkdoc opt">=</span><span class="number">192</span> <span class="gtkdoc opt">!</span> filesink location<span class="gtkdoc opt">=</span>alsasrc<span class="gtkdoc opt">.</span>mp3</pre></td>
- </tr>
- </tbody>
- </table>
-</div>
- Record from a sound card using ALSA and encode to MP3 with an average bitrate of 192kbps
-<div class="informalexample">
- <table class="listing_frame" border="0" cellpadding="0" cellspacing="0">
- <tbody>
- <tr>
- <td class="listing_lines" align="right"><pre>1</pre></td>
- <td class="listing_code"><pre class="programlisting">gst<span class="gtkdoc opt">-</span>launch<span class="gtkdoc opt">-</span><span class="number">1.0</span> <span class="gtkdoc opt">-</span>v filesrc location<span class="gtkdoc opt">=</span>music<span class="gtkdoc opt">.</span>wav <span class="gtkdoc opt">!</span> decodebin <span class="gtkdoc opt">!</span> audioconvert <span class="gtkdoc opt">!</span> audioresample <span class="gtkdoc opt">!</span> lamemp3enc target<span class="gtkdoc opt">=</span>quality quality<span class="gtkdoc opt">=</span><span class="number">0</span> <span class="gtkdoc opt">!</span> id3v2mux <span class="gtkdoc opt">!</span> filesink location<span class="gtkdoc opt">=</span>music<span class="gtkdoc opt">.</span>mp3</pre></td>
- </tr>
- </tbody>
- </table>
-</div>
- Transcode from a .wav file to MP3 (the id3v2mux element is optional) with best VBR quality
-<div class="informalexample">
- <table class="listing_frame" border="0" cellpadding="0" cellspacing="0">
- <tbody>
- <tr>
- <td class="listing_lines" align="right"><pre>1</pre></td>
- <td class="listing_code"><pre class="programlisting">gst<span class="gtkdoc opt">-</span>launch<span class="gtkdoc opt">-</span><span class="number">1.0</span> <span class="gtkdoc opt">-</span>v cdda<span class="gtkdoc opt">:</span><span class="gtkdoc slc">//5 ! audioconvert ! lamemp3enc target=bitrate cbr=true bitrate=192 ! filesink location=track5.mp3</span></pre></td>
- </tr>
- </tbody>
- </table>
-</div>
- Encode Audio CD track 5 to MP3 with a constant bitrate of 192kbps
-<div class="informalexample">
- <table class="listing_frame" border="0" cellpadding="0" cellspacing="0">
- <tbody>
- <tr>
- <td class="listing_lines" align="right"><pre>1</pre></td>
- <td class="listing_code"><pre class="programlisting">gst<span class="gtkdoc opt">-</span>launch<span class="gtkdoc opt">-</span><span class="number">1.0</span> <span class="gtkdoc opt">-</span>v audiotestsrc num<span class="gtkdoc opt">-</span>buffers<span class="gtkdoc opt">=</span><span class="number">10</span> <span class="gtkdoc opt">!</span> audio<span class="gtkdoc opt">/</span>x<span class="gtkdoc opt">-</span>raw<span class="gtkdoc opt">,</span>rate<span class="gtkdoc opt">=</span><span class="number">44100</span><span class="gtkdoc opt">,</span>channels<span class="gtkdoc opt">=</span><span class="number">1</span> <span class="gtkdoc opt">!</span> lamemp3enc target<span class="gtkdoc opt">=</span>bitrate cbr<span class="gtkdoc opt">=</span><span class="keyword">true</span> bitrate<span class="gtkdoc opt">=</span><span class="number">48</span> <span class="gtkdoc opt">!</span> filesink location<span class="gtkdoc opt">=</span>test<span class="gtkdoc opt">.</span>mp3</pre></td>
- </tr>
- </tbody>
- </table>
-</div>
- Encode to a fixed sample rate
-</div>
-<div class="refsynopsisdiv">
-<h2>Synopsis</h2>
-<div class="refsect2">
-<a name="id-1.2.7.8.5.1"></a><h3>Element Information</h3>
-<div class="variablelist"><table border="0" class="variablelist">
-<colgroup>
-<col align="left" valign="top">
-<col>
-</colgroup>
-<tbody>
-<tr>
-<td><p><span class="term">plugin</span></p></td>
-<td>
- <a class="link" href="gst-plugins-ugly-plugins-plugin-lame.html#plugin-lame">lame</a>
- </td>
-</tr>
-<tr>
-<td><p><span class="term">author</span></p></td>
-<td>Sebastian Dröge <sebastian.droege@collabora.co.uk></td>
-</tr>
-<tr>
-<td><p><span class="term">class</span></p></td>
-<td>Codec/Encoder/Audio</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2">
-<a name="id-1.2.7.8.5.2"></a><h3>Element Pads</h3>
-<div class="variablelist"><table border="0" class="variablelist">
-<colgroup>
-<col align="left" valign="top">
-<col>
-</colgroup>
-<tbody>
-<tr>
-<td><p><span class="term">name</span></p></td>
-<td>sink</td>
-</tr>
-<tr>
-<td><p><span class="term">direction</span></p></td>
-<td>sink</td>
-</tr>
-<tr>
-<td><p><span class="term">presence</span></p></td>
-<td>always</td>
-</tr>
-<tr>
-<td><p><span class="term">details</span></p></td>
-<td>audio/x-raw, format=(string)S16LE, layout=(string)interleaved, rate=(int){ 8000, 11025, 12000, 16000, 22050, 24000, 32000, 44100, 48000 }, channels=(int)1</td>
-</tr>
-<tr>
-<td><p><span class="term"></span></p></td>
-<td> audio/x-raw, format=(string)S16LE, layout=(string)interleaved, rate=(int){ 8000, 11025, 12000, 16000, 22050, 24000, 32000, 44100, 48000 }, channels=(int)2, channel-mask=(bitmask)0x0000000000000003</td>
-</tr>
-</tbody>
-</table></div>
-<div class="variablelist"><table border="0" class="variablelist">
-<colgroup>
-<col align="left" valign="top">
-<col>
-</colgroup>
-<tbody>
-<tr>
-<td><p><span class="term">name</span></p></td>
-<td>src</td>
-</tr>
-<tr>
-<td><p><span class="term">direction</span></p></td>
-<td>source</td>
-</tr>
-<tr>
-<td><p><span class="term">presence</span></p></td>
-<td>always</td>
-</tr>
-<tr>
-<td><p><span class="term">details</span></p></td>
-<td>audio/mpeg, mpegversion=(int)1, layer=(int)3, rate=(int){ 8000, 11025, 12000, 16000, 22050, 24000, 32000, 44100, 48000 }, channels=(int)[ 1, 2 ]</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-</div>
-</div>
-<div class="refsect1">
-<a name="gst-plugins-ugly-plugins-lamemp3enc.functions_details"></a><h2>Functions</h2>
-<p></p>
-</div>
-<div class="refsect1">
-<a name="gst-plugins-ugly-plugins-lamemp3enc.other_details"></a><h2>Types and Values</h2>
-<div class="refsect2">
-<a name="GstLameMP3Enc-struct"></a><h3>struct GstLameMP3Enc</h3>
-<pre class="programlisting">struct GstLameMP3Enc;</pre>
-<p>Opaque data structure.</p>
-</div>
-</div>
-<div class="refsect1">
-<a name="gst-plugins-ugly-plugins-lamemp3enc.property-details"></a><h2>Property Details</h2>
-<div class="refsect2">
-<a name="GstLameMP3Enc--bitrate"></a><h3>The <code class="literal">“bitrate”</code> property</h3>
-<pre class="programlisting"> “bitrate” <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"><span class="type">gint</span></a></pre>
-<p>Bitrate in kbit/sec (Only valid if target is bitrate, for CBR one of 8, 16, 24, 32, 40, 48, 56, 64, 80, 96, 112, 128, 160, 192, 224, 256 or 320).</p>
-<p>Flags: Read / Write / Construct</p>
-<p>Allowed values: [8,320]</p>
-<p>Default value: 128</p>
-</div>
-<hr>
-<div class="refsect2">
-<a name="GstLameMP3Enc--cbr"></a><h3>The <code class="literal">“cbr”</code> property</h3>
-<pre class="programlisting"> “cbr” <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a></pre>
-<p>Enforce constant bitrate encoding (Only valid if target is bitrate).</p>
-<p>Flags: Read / Write / Construct</p>
-<p>Default value: FALSE</p>
-</div>
-<hr>
-<div class="refsect2">
-<a name="GstLameMP3Enc--encoding-engine-quality"></a><h3>The <code class="literal">“encoding-engine-quality”</code> property</h3>
-<pre class="programlisting"> “encoding-engine-quality” <span class="type">GstLameMP3EncEncodingEngineQuality</span></pre>
-<p>Quality/speed of the encoding engine, this does not affect the bitrate!.</p>
-<p>Flags: Read / Write / Construct</p>
-<p>Default value: Standard</p>
-</div>
-<hr>
-<div class="refsect2">
-<a name="GstLameMP3Enc--mono"></a><h3>The <code class="literal">“mono”</code> property</h3>
-<pre class="programlisting"> “mono” <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a></pre>
-<p>Enforce mono encoding.</p>
-<p>Flags: Read / Write / Construct</p>
-<p>Default value: FALSE</p>
-</div>
-<hr>
-<div class="refsect2">
-<a name="GstLameMP3Enc--quality"></a><h3>The <code class="literal">“quality”</code> property</h3>
-<pre class="programlisting"> “quality” <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gfloat"><span class="type">gfloat</span></a></pre>
-<p>VBR Quality from 0 to 10, 0 being the best (Only valid if target is quality).</p>
-<p>Flags: Read / Write / Construct</p>
-<p>Allowed values: [0,9.999]</p>
-<p>Default value: 4</p>
-</div>
-<hr>
-<div class="refsect2">
-<a name="GstLameMP3Enc--target"></a><h3>The <code class="literal">“target”</code> property</h3>
-<pre class="programlisting"> “target” <span class="type">GstLameMP3EncTarget</span></pre>
-<p>Optimize for quality or bitrate.</p>
-<p>Flags: Read / Write / Construct</p>
-<p>Default value: Quality</p>
-</div>
-</div>
-<div class="refsect1">
-<a name="gst-plugins-ugly-plugins-lamemp3enc.see-also"></a><h2>See Also</h2>
-<p>lame, mad, vorbisenc</p>
-</div>
-</div>
-<div class="footer">
-<hr>Generated by GTK-Doc V1.26</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/plugins/html/gst-plugins-ugly-plugins-mpg123audiodec.html b/docs/plugins/html/gst-plugins-ugly-plugins-mpg123audiodec.html
deleted file mode 100644
index e521a08..0000000
--- a/docs/plugins/html/gst-plugins-ugly-plugins-mpg123audiodec.html
+++ /dev/null
@@ -1,175 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>mpg123audiodec: GStreamer Ugly Plugins 1.0 Plugins Reference Manual</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.79.1">
-<link rel="home" href="index.html" title="GStreamer Ugly Plugins 1.0 Plugins Reference Manual">
-<link rel="up" href="ch01.html" title="gst-plugins-ugly Elements">
-<link rel="prev" href="gst-plugins-ugly-plugins-lamemp3enc.html" title="lamemp3enc">
-<link rel="next" href="gst-plugins-ugly-plugins-rademux.html" title="rademux">
-<meta name="generator" content="GTK-Doc V1.26 (XML mode)">
-<link rel="stylesheet" href="style.css" type="text/css">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
-<td width="100%" align="left" class="shortcuts">
-<a href="#" class="shortcut">Top</a><span id="nav_description"> <span class="dim">|</span>
- <a href="#gst-plugins-ugly-plugins-mpg123audiodec.description" class="shortcut">Description</a></span><span id="nav_hierarchy"> <span class="dim">|</span>
- <a href="#gst-plugins-ugly-plugins-mpg123audiodec.object-hierarchy" class="shortcut">Object Hierarchy</a></span>
-</td>
-<td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
-<td><a accesskey="u" href="ch01.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
-<td><a accesskey="p" href="gst-plugins-ugly-plugins-lamemp3enc.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
-<td><a accesskey="n" href="gst-plugins-ugly-plugins-rademux.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
-</tr></table>
-<div class="refentry">
-<a name="gst-plugins-ugly-plugins-mpg123audiodec"></a><div class="titlepage"></div>
-<div class="refnamediv"><table width="100%"><tr>
-<td valign="top">
-<h2><span class="refentrytitle"><a name="gst-plugins-ugly-plugins-mpg123audiodec.top_of_page"></a>mpg123audiodec</span></h2>
-<p>mpg123audiodec</p>
-</td>
-<td class="gallery_image" valign="top" align="right"></td>
-</tr></table></div>
-<a name="GstMpg123AudioDec"></a><div class="refsect1">
-<a name="gst-plugins-ugly-plugins-mpg123audiodec.other"></a><h2>Types and Values</h2>
-<div class="informaltable"><table class="informaltable" width="100%" border="0">
-<colgroup>
-<col width="150px" class="name">
-<col class="description">
-</colgroup>
-<tbody><tr>
-<td class="datatype_keyword">struct</td>
-<td class="function_name"><a class="link" href="gst-plugins-ugly-plugins-mpg123audiodec.html#GstMpg123AudioDec-struct" title="struct GstMpg123AudioDec">GstMpg123AudioDec</a></td>
-</tr></tbody>
-</table></div>
-</div>
-<div class="refsect1">
-<a name="gst-plugins-ugly-plugins-mpg123audiodec.object-hierarchy"></a><h2>Object Hierarchy</h2>
-<pre class="screen"> <a href="/usr/share/gtk-doc/html/gobject/gobject-The-Base-Object-Type.html#GObject-struct">GObject</a>
- <span class="lineart">╰──</span> <a href="/usr/share/gtk-doc/html/gobject/gobject-The-Base-Object-Type.html#GInitiallyUnowned">GInitiallyUnowned</a>
- <span class="lineart">╰──</span> <a href="/usr/share/gtk-doc/html/gstreamer-1.0/GstObject.html#GstObject-struct">GstObject</a>
- <span class="lineart">╰──</span> <a href="/usr/share/gtk-doc/html/gstreamer-1.0/GstElement.html#GstElement-struct">GstElement</a>
- <span class="lineart">╰──</span> <a href="/usr/share/gtk-doc/html/gst-plugins-base-libs-1.0/GstAudioDecoder.html#GstAudioDecoder-struct">GstAudioDecoder</a>
- <span class="lineart">╰──</span> GstMpg123AudioDec
-</pre>
-</div>
-<div class="refsect1">
-<a name="gst-plugins-ugly-plugins-mpg123audiodec.description"></a><h2>Description</h2>
-<p>Audio decoder for MPEG-1 layer 1/2/3 audio data.</p>
-<div class="refsect2">
-<a name="id-1.2.8.6.3"></a><h3>Example pipelines</h3>
-<div class="informalexample">
- <table class="listing_frame" border="0" cellpadding="0" cellspacing="0">
- <tbody>
- <tr>
- <td class="listing_lines" align="right"><pre>1</pre></td>
- <td class="listing_code"><pre class="programlisting">gst<span class="gtkdoc opt">-</span>launch<span class="gtkdoc opt">-</span><span class="number">1.0</span> filesrc location<span class="gtkdoc opt">=</span>music<span class="gtkdoc opt">.</span>mp3 <span class="gtkdoc opt">!</span> mpegaudioparse <span class="gtkdoc opt">!</span> mpg123audiodec <span class="gtkdoc opt">!</span> audioconvert <span class="gtkdoc opt">!</span> audioresample <span class="gtkdoc opt">!</span> autoaudiosink</pre></td>
- </tr>
- </tbody>
- </table>
-</div>
- Decode and play the mp3 file
-</div>
-<div class="refsynopsisdiv">
-<h2>Synopsis</h2>
-<div class="refsect2">
-<a name="id-1.2.8.6.4.1"></a><h3>Element Information</h3>
-<div class="variablelist"><table border="0" class="variablelist">
-<colgroup>
-<col align="left" valign="top">
-<col>
-</colgroup>
-<tbody>
-<tr>
-<td><p><span class="term">plugin</span></p></td>
-<td>
- <a class="link" href="gst-plugins-ugly-plugins-plugin-mpg123.html#plugin-mpg123">mpg123</a>
- </td>
-</tr>
-<tr>
-<td><p><span class="term">author</span></p></td>
-<td>Carlos Rafael Giani <dv@pseudoterminal.org></td>
-</tr>
-<tr>
-<td><p><span class="term">class</span></p></td>
-<td>Codec/Decoder/Audio</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2">
-<a name="id-1.2.8.6.4.2"></a><h3>Element Pads</h3>
-<div class="variablelist"><table border="0" class="variablelist">
-<colgroup>
-<col align="left" valign="top">
-<col>
-</colgroup>
-<tbody>
-<tr>
-<td><p><span class="term">name</span></p></td>
-<td>sink</td>
-</tr>
-<tr>
-<td><p><span class="term">direction</span></p></td>
-<td>sink</td>
-</tr>
-<tr>
-<td><p><span class="term">presence</span></p></td>
-<td>always</td>
-</tr>
-<tr>
-<td><p><span class="term">details</span></p></td>
-<td>audio/mpeg, mpegversion=(int)1, layer=(int)[ 1, 3 ], rate=(int){ 8000, 11025, 12000, 16000, 22050, 24000, 32000, 44100, 48000 }, channels=(int)[ 1, 2 ], parsed=(boolean)true</td>
-</tr>
-</tbody>
-</table></div>
-<div class="variablelist"><table border="0" class="variablelist">
-<colgroup>
-<col align="left" valign="top">
-<col>
-</colgroup>
-<tbody>
-<tr>
-<td><p><span class="term">name</span></p></td>
-<td>src</td>
-</tr>
-<tr>
-<td><p><span class="term">direction</span></p></td>
-<td>source</td>
-</tr>
-<tr>
-<td><p><span class="term">presence</span></p></td>
-<td>always</td>
-</tr>
-<tr>
-<td><p><span class="term">details</span></p></td>
-<td>audio/x-raw, format=(string){ S16LE, U16LE, S32LE, U32LE, S24LE, U24LE, F32LE }, rate=(int){ 8000, 11025, 12000, 16000, 22050, 24000, 32000, 44100, 48000 }, channels=(int)[ 1, 2 ], layout=(string)interleaved</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-</div>
-</div>
-<div class="refsect1">
-<a name="gst-plugins-ugly-plugins-mpg123audiodec.functions_details"></a><h2>Functions</h2>
-<p></p>
-</div>
-<div class="refsect1">
-<a name="gst-plugins-ugly-plugins-mpg123audiodec.other_details"></a><h2>Types and Values</h2>
-<div class="refsect2">
-<a name="GstMpg123AudioDec-struct"></a><h3>struct GstMpg123AudioDec</h3>
-<pre class="programlisting">struct GstMpg123AudioDec;</pre>
-</div>
-</div>
-<div class="refsect1">
-<a name="gst-plugins-ugly-plugins-mpg123audiodec.see-also"></a><h2>See Also</h2>
-<p>lamemp3enc, mad</p>
-</div>
-</div>
-<div class="footer">
-<hr>Generated by GTK-Doc V1.26</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/plugins/html/gst-plugins-ugly-plugins-plugin-a52dec.html b/docs/plugins/html/gst-plugins-ugly-plugins-plugin-a52dec.html
index 1e0048e..d421ec1 100644
--- a/docs/plugins/html/gst-plugins-ugly-plugins-plugin-a52dec.html
+++ b/docs/plugins/html/gst-plugins-ugly-plugins-plugin-a52dec.html
@@ -8,7 +8,7 @@
<link rel="up" href="ch02.html" title="gst-plugins-ugly Plugins">
<link rel="prev" href="ch02.html" title="gst-plugins-ugly Plugins">
<link rel="next" href="gst-plugins-ugly-plugins-plugin-amrnb.html" title="amrnb">
-<meta name="generator" content="GTK-Doc V1.26 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.27 (XML mode)">
<link rel="stylesheet" href="style.css" type="text/css">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -42,7 +42,7 @@
</tr>
<tr>
<td><p><span class="term">version</span></p></td>
-<td>1.12.4</td>
+<td>1.13.1</td>
</tr>
<tr>
<td><p><span class="term">run-time license</span></p></td>
@@ -74,6 +74,6 @@
</div>
</div>
<div class="footer">
-<hr>Generated by GTK-Doc V1.26</div>
+<hr>Generated by GTK-Doc V1.27</div>
</body>
</html>
\ No newline at end of file
diff --git a/docs/plugins/html/gst-plugins-ugly-plugins-plugin-amrnb.html b/docs/plugins/html/gst-plugins-ugly-plugins-plugin-amrnb.html
index dec01e6..f885435 100644
--- a/docs/plugins/html/gst-plugins-ugly-plugins-plugin-amrnb.html
+++ b/docs/plugins/html/gst-plugins-ugly-plugins-plugin-amrnb.html
@@ -8,7 +8,7 @@
<link rel="up" href="ch02.html" title="gst-plugins-ugly Plugins">
<link rel="prev" href="gst-plugins-ugly-plugins-plugin-a52dec.html" title="a52dec">
<link rel="next" href="gst-plugins-ugly-plugins-plugin-amrwbdec.html" title="amrwbdec">
-<meta name="generator" content="GTK-Doc V1.26 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.27 (XML mode)">
<link rel="stylesheet" href="style.css" type="text/css">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -42,7 +42,7 @@
</tr>
<tr>
<td><p><span class="term">version</span></p></td>
-<td>1.12.4</td>
+<td>1.13.1</td>
</tr>
<tr>
<td><p><span class="term">run-time license</span></p></td>
@@ -80,6 +80,6 @@
</div>
</div>
<div class="footer">
-<hr>Generated by GTK-Doc V1.26</div>
+<hr>Generated by GTK-Doc V1.27</div>
</body>
</html>
\ No newline at end of file
diff --git a/docs/plugins/html/gst-plugins-ugly-plugins-plugin-amrwbdec.html b/docs/plugins/html/gst-plugins-ugly-plugins-plugin-amrwbdec.html
index 7894f13..8a76d5c 100644
--- a/docs/plugins/html/gst-plugins-ugly-plugins-plugin-amrwbdec.html
+++ b/docs/plugins/html/gst-plugins-ugly-plugins-plugin-amrwbdec.html
@@ -8,7 +8,7 @@
<link rel="up" href="ch02.html" title="gst-plugins-ugly Plugins">
<link rel="prev" href="gst-plugins-ugly-plugins-plugin-amrnb.html" title="amrnb">
<link rel="next" href="gst-plugins-ugly-plugins-plugin-asf.html" title="asf">
-<meta name="generator" content="GTK-Doc V1.26 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.27 (XML mode)">
<link rel="stylesheet" href="style.css" type="text/css">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -42,7 +42,7 @@
</tr>
<tr>
<td><p><span class="term">version</span></p></td>
-<td>1.12.4</td>
+<td>1.13.1</td>
</tr>
<tr>
<td><p><span class="term">run-time license</span></p></td>
@@ -74,6 +74,6 @@
</div>
</div>
<div class="footer">
-<hr>Generated by GTK-Doc V1.26</div>
+<hr>Generated by GTK-Doc V1.27</div>
</body>
</html>
\ No newline at end of file
diff --git a/docs/plugins/html/gst-plugins-ugly-plugins-plugin-asf.html b/docs/plugins/html/gst-plugins-ugly-plugins-plugin-asf.html
index 3428b59..7080d48 100644
--- a/docs/plugins/html/gst-plugins-ugly-plugins-plugin-asf.html
+++ b/docs/plugins/html/gst-plugins-ugly-plugins-plugin-asf.html
@@ -8,7 +8,7 @@
<link rel="up" href="ch02.html" title="gst-plugins-ugly Plugins">
<link rel="prev" href="gst-plugins-ugly-plugins-plugin-amrwbdec.html" title="amrwbdec">
<link rel="next" href="gst-plugins-ugly-plugins-plugin-cdio.html" title="cdio">
-<meta name="generator" content="GTK-Doc V1.26 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.27 (XML mode)">
<link rel="stylesheet" href="style.css" type="text/css">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -42,7 +42,7 @@
</tr>
<tr>
<td><p><span class="term">version</span></p></td>
-<td>1.12.4</td>
+<td>1.13.1</td>
</tr>
<tr>
<td><p><span class="term">run-time license</span></p></td>
@@ -84,6 +84,6 @@
</div>
</div>
<div class="footer">
-<hr>Generated by GTK-Doc V1.26</div>
+<hr>Generated by GTK-Doc V1.27</div>
</body>
</html>
\ No newline at end of file
diff --git a/docs/plugins/html/gst-plugins-ugly-plugins-plugin-cdio.html b/docs/plugins/html/gst-plugins-ugly-plugins-plugin-cdio.html
index 7c3f030..0f34879 100644
--- a/docs/plugins/html/gst-plugins-ugly-plugins-plugin-cdio.html
+++ b/docs/plugins/html/gst-plugins-ugly-plugins-plugin-cdio.html
@@ -8,7 +8,7 @@
<link rel="up" href="ch02.html" title="gst-plugins-ugly Plugins">
<link rel="prev" href="gst-plugins-ugly-plugins-plugin-asf.html" title="asf">
<link rel="next" href="gst-plugins-ugly-plugins-plugin-dvdlpcmdec.html" title="dvdlpcmdec">
-<meta name="generator" content="GTK-Doc V1.26 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.27 (XML mode)">
<link rel="stylesheet" href="style.css" type="text/css">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -42,7 +42,7 @@
</tr>
<tr>
<td><p><span class="term">version</span></p></td>
-<td>1.12.4</td>
+<td>1.13.1</td>
</tr>
<tr>
<td><p><span class="term">run-time license</span></p></td>
@@ -74,6 +74,6 @@
</div>
</div>
<div class="footer">
-<hr>Generated by GTK-Doc V1.26</div>
+<hr>Generated by GTK-Doc V1.27</div>
</body>
</html>
\ No newline at end of file
diff --git a/docs/plugins/html/gst-plugins-ugly-plugins-plugin-dvdlpcmdec.html b/docs/plugins/html/gst-plugins-ugly-plugins-plugin-dvdlpcmdec.html
index 16a6691..8f939ec 100644
--- a/docs/plugins/html/gst-plugins-ugly-plugins-plugin-dvdlpcmdec.html
+++ b/docs/plugins/html/gst-plugins-ugly-plugins-plugin-dvdlpcmdec.html
@@ -8,7 +8,7 @@
<link rel="up" href="ch02.html" title="gst-plugins-ugly Plugins">
<link rel="prev" href="gst-plugins-ugly-plugins-plugin-cdio.html" title="cdio">
<link rel="next" href="gst-plugins-ugly-plugins-plugin-dvdread.html" title="dvdread">
-<meta name="generator" content="GTK-Doc V1.26 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.27 (XML mode)">
<link rel="stylesheet" href="style.css" type="text/css">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -42,7 +42,7 @@
</tr>
<tr>
<td><p><span class="term">version</span></p></td>
-<td>1.12.4</td>
+<td>1.13.1</td>
</tr>
<tr>
<td><p><span class="term">run-time license</span></p></td>
@@ -74,6 +74,6 @@
</div>
</div>
<div class="footer">
-<hr>Generated by GTK-Doc V1.26</div>
+<hr>Generated by GTK-Doc V1.27</div>
</body>
</html>
\ No newline at end of file
diff --git a/docs/plugins/html/gst-plugins-ugly-plugins-plugin-dvdread.html b/docs/plugins/html/gst-plugins-ugly-plugins-plugin-dvdread.html
index 4d514ba..3394e9a 100644
--- a/docs/plugins/html/gst-plugins-ugly-plugins-plugin-dvdread.html
+++ b/docs/plugins/html/gst-plugins-ugly-plugins-plugin-dvdread.html
@@ -8,7 +8,7 @@
<link rel="up" href="ch02.html" title="gst-plugins-ugly Plugins">
<link rel="prev" href="gst-plugins-ugly-plugins-plugin-dvdlpcmdec.html" title="dvdlpcmdec">
<link rel="next" href="gst-plugins-ugly-plugins-plugin-dvdsub.html" title="dvdsub">
-<meta name="generator" content="GTK-Doc V1.26 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.27 (XML mode)">
<link rel="stylesheet" href="style.css" type="text/css">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -42,7 +42,7 @@
</tr>
<tr>
<td><p><span class="term">version</span></p></td>
-<td>1.12.4</td>
+<td>1.13.1</td>
</tr>
<tr>
<td><p><span class="term">run-time license</span></p></td>
@@ -74,6 +74,6 @@
</div>
</div>
<div class="footer">
-<hr>Generated by GTK-Doc V1.26</div>
+<hr>Generated by GTK-Doc V1.27</div>
</body>
</html>
\ No newline at end of file
diff --git a/docs/plugins/html/gst-plugins-ugly-plugins-plugin-dvdsub.html b/docs/plugins/html/gst-plugins-ugly-plugins-plugin-dvdsub.html
index c8308fd..eae1c12 100644
--- a/docs/plugins/html/gst-plugins-ugly-plugins-plugin-dvdsub.html
+++ b/docs/plugins/html/gst-plugins-ugly-plugins-plugin-dvdsub.html
@@ -7,8 +7,8 @@
<link rel="home" href="index.html" title="GStreamer Ugly Plugins 1.0 Plugins Reference Manual">
<link rel="up" href="ch02.html" title="gst-plugins-ugly Plugins">
<link rel="prev" href="gst-plugins-ugly-plugins-plugin-dvdread.html" title="dvdread">
-<link rel="next" href="gst-plugins-ugly-plugins-plugin-lame.html" title="lame">
-<meta name="generator" content="GTK-Doc V1.26 (XML mode)">
+<link rel="next" href="gst-plugins-ugly-plugins-plugin-mpeg2dec.html" title="mpeg2dec">
+<meta name="generator" content="GTK-Doc V1.27 (XML mode)">
<link rel="stylesheet" href="style.css" type="text/css">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -17,7 +17,7 @@
<td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
<td><a accesskey="u" href="ch02.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
<td><a accesskey="p" href="gst-plugins-ugly-plugins-plugin-dvdread.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
-<td><a accesskey="n" href="gst-plugins-ugly-plugins-plugin-lame.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
+<td><a accesskey="n" href="gst-plugins-ugly-plugins-plugin-mpeg2dec.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
</tr></table>
<div class="refentry">
<a name="gst-plugins-ugly-plugins-plugin-dvdsub"></a><div class="titlepage"></div>
@@ -42,7 +42,7 @@
</tr>
<tr>
<td><p><span class="term">version</span></p></td>
-<td>1.12.4</td>
+<td>1.13.1</td>
</tr>
<tr>
<td><p><span class="term">run-time license</span></p></td>
@@ -80,6 +80,6 @@
</div>
</div>
<div class="footer">
-<hr>Generated by GTK-Doc V1.26</div>
+<hr>Generated by GTK-Doc V1.27</div>
</body>
</html>
\ No newline at end of file
diff --git a/docs/plugins/html/gst-plugins-ugly-plugins-plugin-lame.html b/docs/plugins/html/gst-plugins-ugly-plugins-plugin-lame.html
deleted file mode 100644
index 16dbbc9..0000000
--- a/docs/plugins/html/gst-plugins-ugly-plugins-plugin-lame.html
+++ /dev/null
@@ -1,79 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>lame: GStreamer Ugly Plugins 1.0 Plugins Reference Manual</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.79.1">
-<link rel="home" href="index.html" title="GStreamer Ugly Plugins 1.0 Plugins Reference Manual">
-<link rel="up" href="ch02.html" title="gst-plugins-ugly Plugins">
-<link rel="prev" href="gst-plugins-ugly-plugins-plugin-dvdsub.html" title="dvdsub">
-<link rel="next" href="gst-plugins-ugly-plugins-plugin-mpeg2dec.html" title="mpeg2dec">
-<meta name="generator" content="GTK-Doc V1.26 (XML mode)">
-<link rel="stylesheet" href="style.css" type="text/css">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
-<td width="100%" align="left" class="shortcuts"></td>
-<td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
-<td><a accesskey="u" href="ch02.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
-<td><a accesskey="p" href="gst-plugins-ugly-plugins-plugin-dvdsub.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
-<td><a accesskey="n" href="gst-plugins-ugly-plugins-plugin-mpeg2dec.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
-</tr></table>
-<div class="refentry">
-<a name="gst-plugins-ugly-plugins-plugin-lame"></a><div class="titlepage"></div>
-<div class="refnamediv"><table width="100%"><tr>
-<td valign="top">
-<h2><span class="refentrytitle">lame</span></h2>
-<p>lame — <a name="plugin-lame"></a>Encode MP3s with LAME</p>
-</td>
-<td class="gallery_image" valign="top" align="right"></td>
-</tr></table></div>
-<div class="refsect1">
-<a name="id-1.3.10.3"></a><h2>Plugin Information</h2>
-<div class="variablelist"><table border="0" class="variablelist">
-<colgroup>
-<col align="left" valign="top">
-<col>
-</colgroup>
-<tbody>
-<tr>
-<td><p><span class="term">filename</span></p></td>
-<td>libgstlame.so</td>
-</tr>
-<tr>
-<td><p><span class="term">version</span></p></td>
-<td>1.12.4</td>
-</tr>
-<tr>
-<td><p><span class="term">run-time license</span></p></td>
-<td>LGPL</td>
-</tr>
-<tr>
-<td><p><span class="term">package</span></p></td>
-<td>GStreamer Ugly Plug-ins source release</td>
-</tr>
-<tr>
-<td><p><span class="term">origin</span></p></td>
-<td>Unknown package origin</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<div class="refsect1">
-<a name="id-1.3.10.4"></a><h2>Elements</h2>
-<div class="variablelist"><table border="0" class="variablelist">
-<colgroup>
-<col align="left" valign="top">
-<col>
-</colgroup>
-<tbody><tr>
-<td><p><span class="term"><a class="link" href="gst-plugins-ugly-plugins-lamemp3enc.html" title="lamemp3enc">lamemp3enc</a></span></p></td>
-<td>High-quality free MP3 encoder</td>
-</tr></tbody>
-</table></div>
-</div>
-</div>
-<div class="footer">
-<hr>Generated by GTK-Doc V1.26</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/plugins/html/gst-plugins-ugly-plugins-plugin-mpeg2dec.html b/docs/plugins/html/gst-plugins-ugly-plugins-plugin-mpeg2dec.html
index 96312e4..daab5a4 100644
--- a/docs/plugins/html/gst-plugins-ugly-plugins-plugin-mpeg2dec.html
+++ b/docs/plugins/html/gst-plugins-ugly-plugins-plugin-mpeg2dec.html
@@ -6,9 +6,9 @@
<meta name="generator" content="DocBook XSL Stylesheets V1.79.1">
<link rel="home" href="index.html" title="GStreamer Ugly Plugins 1.0 Plugins Reference Manual">
<link rel="up" href="ch02.html" title="gst-plugins-ugly Plugins">
-<link rel="prev" href="gst-plugins-ugly-plugins-plugin-lame.html" title="lame">
-<link rel="next" href="gst-plugins-ugly-plugins-plugin-mpg123.html" title="mpg123">
-<meta name="generator" content="GTK-Doc V1.26 (XML mode)">
+<link rel="prev" href="gst-plugins-ugly-plugins-plugin-dvdsub.html" title="dvdsub">
+<link rel="next" href="gst-plugins-ugly-plugins-plugin-realmedia.html" title="realmedia">
+<meta name="generator" content="GTK-Doc V1.27 (XML mode)">
<link rel="stylesheet" href="style.css" type="text/css">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -16,8 +16,8 @@
<td width="100%" align="left" class="shortcuts"></td>
<td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
<td><a accesskey="u" href="ch02.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
-<td><a accesskey="p" href="gst-plugins-ugly-plugins-plugin-lame.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
-<td><a accesskey="n" href="gst-plugins-ugly-plugins-plugin-mpg123.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
+<td><a accesskey="p" href="gst-plugins-ugly-plugins-plugin-dvdsub.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="n" href="gst-plugins-ugly-plugins-plugin-realmedia.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
</tr></table>
<div class="refentry">
<a name="gst-plugins-ugly-plugins-plugin-mpeg2dec"></a><div class="titlepage"></div>
@@ -29,7 +29,7 @@
<td class="gallery_image" valign="top" align="right"></td>
</tr></table></div>
<div class="refsect1">
-<a name="id-1.3.11.3"></a><h2>Plugin Information</h2>
+<a name="id-1.3.10.3"></a><h2>Plugin Information</h2>
<div class="variablelist"><table border="0" class="variablelist">
<colgroup>
<col align="left" valign="top">
@@ -42,7 +42,7 @@
</tr>
<tr>
<td><p><span class="term">version</span></p></td>
-<td>1.12.4</td>
+<td>1.13.1</td>
</tr>
<tr>
<td><p><span class="term">run-time license</span></p></td>
@@ -60,7 +60,7 @@
</table></div>
</div>
<div class="refsect1">
-<a name="id-1.3.11.4"></a><h2>Elements</h2>
+<a name="id-1.3.10.4"></a><h2>Elements</h2>
<div class="variablelist"><table border="0" class="variablelist">
<colgroup>
<col align="left" valign="top">
@@ -74,6 +74,6 @@
</div>
</div>
<div class="footer">
-<hr>Generated by GTK-Doc V1.26</div>
+<hr>Generated by GTK-Doc V1.27</div>
</body>
</html>
\ No newline at end of file
diff --git a/docs/plugins/html/gst-plugins-ugly-plugins-plugin-mpg123.html b/docs/plugins/html/gst-plugins-ugly-plugins-plugin-mpg123.html
deleted file mode 100644
index 67f9bf3..0000000
--- a/docs/plugins/html/gst-plugins-ugly-plugins-plugin-mpg123.html
+++ /dev/null
@@ -1,79 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>mpg123: GStreamer Ugly Plugins 1.0 Plugins Reference Manual</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.79.1">
-<link rel="home" href="index.html" title="GStreamer Ugly Plugins 1.0 Plugins Reference Manual">
-<link rel="up" href="ch02.html" title="gst-plugins-ugly Plugins">
-<link rel="prev" href="gst-plugins-ugly-plugins-plugin-mpeg2dec.html" title="mpeg2dec">
-<link rel="next" href="gst-plugins-ugly-plugins-plugin-realmedia.html" title="realmedia">
-<meta name="generator" content="GTK-Doc V1.26 (XML mode)">
-<link rel="stylesheet" href="style.css" type="text/css">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
-<td width="100%" align="left" class="shortcuts"></td>
-<td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
-<td><a accesskey="u" href="ch02.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
-<td><a accesskey="p" href="gst-plugins-ugly-plugins-plugin-mpeg2dec.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
-<td><a accesskey="n" href="gst-plugins-ugly-plugins-plugin-realmedia.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
-</tr></table>
-<div class="refentry">
-<a name="gst-plugins-ugly-plugins-plugin-mpg123"></a><div class="titlepage"></div>
-<div class="refnamediv"><table width="100%"><tr>
-<td valign="top">
-<h2><span class="refentrytitle">mpg123</span></h2>
-<p>mpg123 — <a name="plugin-mpg123"></a>mp3 decoding based on the mpg123 library</p>
-</td>
-<td class="gallery_image" valign="top" align="right"></td>
-</tr></table></div>
-<div class="refsect1">
-<a name="id-1.3.12.3"></a><h2>Plugin Information</h2>
-<div class="variablelist"><table border="0" class="variablelist">
-<colgroup>
-<col align="left" valign="top">
-<col>
-</colgroup>
-<tbody>
-<tr>
-<td><p><span class="term">filename</span></p></td>
-<td>libgstmpg123.so</td>
-</tr>
-<tr>
-<td><p><span class="term">version</span></p></td>
-<td>1.12.4</td>
-</tr>
-<tr>
-<td><p><span class="term">run-time license</span></p></td>
-<td>LGPL</td>
-</tr>
-<tr>
-<td><p><span class="term">package</span></p></td>
-<td>GStreamer Ugly Plug-ins source release</td>
-</tr>
-<tr>
-<td><p><span class="term">origin</span></p></td>
-<td>Unknown package origin</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<div class="refsect1">
-<a name="id-1.3.12.4"></a><h2>Elements</h2>
-<div class="variablelist"><table border="0" class="variablelist">
-<colgroup>
-<col align="left" valign="top">
-<col>
-</colgroup>
-<tbody><tr>
-<td><p><span class="term"><a class="link" href="gst-plugins-ugly-plugins-mpg123audiodec.html" title="mpg123audiodec">mpg123audiodec</a></span></p></td>
-<td>Decodes mp3 streams using the mpg123 library</td>
-</tr></tbody>
-</table></div>
-</div>
-</div>
-<div class="footer">
-<hr>Generated by GTK-Doc V1.26</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/plugins/html/gst-plugins-ugly-plugins-plugin-realmedia.html b/docs/plugins/html/gst-plugins-ugly-plugins-plugin-realmedia.html
index a150d90..2563377 100644
--- a/docs/plugins/html/gst-plugins-ugly-plugins-plugin-realmedia.html
+++ b/docs/plugins/html/gst-plugins-ugly-plugins-plugin-realmedia.html
@@ -6,9 +6,9 @@
<meta name="generator" content="DocBook XSL Stylesheets V1.79.1">
<link rel="home" href="index.html" title="GStreamer Ugly Plugins 1.0 Plugins Reference Manual">
<link rel="up" href="ch02.html" title="gst-plugins-ugly Plugins">
-<link rel="prev" href="gst-plugins-ugly-plugins-plugin-mpg123.html" title="mpg123">
-<link rel="next" href="gst-plugins-ugly-plugins-plugin-siddec.html" title="siddec">
-<meta name="generator" content="GTK-Doc V1.26 (XML mode)">
+<link rel="prev" href="gst-plugins-ugly-plugins-plugin-mpeg2dec.html" title="mpeg2dec">
+<link rel="next" href="gst-plugins-ugly-plugins-plugin-sid.html" title="sid">
+<meta name="generator" content="GTK-Doc V1.27 (XML mode)">
<link rel="stylesheet" href="style.css" type="text/css">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -16,8 +16,8 @@
<td width="100%" align="left" class="shortcuts"></td>
<td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
<td><a accesskey="u" href="ch02.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
-<td><a accesskey="p" href="gst-plugins-ugly-plugins-plugin-mpg123.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
-<td><a accesskey="n" href="gst-plugins-ugly-plugins-plugin-siddec.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
+<td><a accesskey="p" href="gst-plugins-ugly-plugins-plugin-mpeg2dec.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="n" href="gst-plugins-ugly-plugins-plugin-sid.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
</tr></table>
<div class="refentry">
<a name="gst-plugins-ugly-plugins-plugin-realmedia"></a><div class="titlepage"></div>
@@ -29,7 +29,7 @@
<td class="gallery_image" valign="top" align="right"></td>
</tr></table></div>
<div class="refsect1">
-<a name="id-1.3.13.3"></a><h2>Plugin Information</h2>
+<a name="id-1.3.11.3"></a><h2>Plugin Information</h2>
<div class="variablelist"><table border="0" class="variablelist">
<colgroup>
<col align="left" valign="top">
@@ -42,7 +42,7 @@
</tr>
<tr>
<td><p><span class="term">version</span></p></td>
-<td>1.12.4</td>
+<td>1.13.1</td>
</tr>
<tr>
<td><p><span class="term">run-time license</span></p></td>
@@ -60,7 +60,7 @@
</table></div>
</div>
<div class="refsect1">
-<a name="id-1.3.13.4"></a><h2>Elements</h2>
+<a name="id-1.3.11.4"></a><h2>Elements</h2>
<div class="variablelist"><table border="0" class="variablelist">
<colgroup>
<col align="left" valign="top">
@@ -96,6 +96,6 @@
</div>
</div>
<div class="footer">
-<hr>Generated by GTK-Doc V1.26</div>
+<hr>Generated by GTK-Doc V1.27</div>
</body>
</html>
\ No newline at end of file
diff --git a/docs/plugins/html/gst-plugins-ugly-plugins-plugin-siddec.html b/docs/plugins/html/gst-plugins-ugly-plugins-plugin-sid.html
similarity index 76%
rename from docs/plugins/html/gst-plugins-ugly-plugins-plugin-siddec.html
rename to docs/plugins/html/gst-plugins-ugly-plugins-plugin-sid.html
index a256e3a..6869827 100644
--- a/docs/plugins/html/gst-plugins-ugly-plugins-plugin-siddec.html
+++ b/docs/plugins/html/gst-plugins-ugly-plugins-plugin-sid.html
@@ -2,13 +2,13 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>siddec: GStreamer Ugly Plugins 1.0 Plugins Reference Manual</title>
+<title>sid: GStreamer Ugly Plugins 1.0 Plugins Reference Manual</title>
<meta name="generator" content="DocBook XSL Stylesheets V1.79.1">
<link rel="home" href="index.html" title="GStreamer Ugly Plugins 1.0 Plugins Reference Manual">
<link rel="up" href="ch02.html" title="gst-plugins-ugly Plugins">
<link rel="prev" href="gst-plugins-ugly-plugins-plugin-realmedia.html" title="realmedia">
-<link rel="next" href="gst-plugins-ugly-plugins-plugin-twolame.html" title="twolame">
-<meta name="generator" content="GTK-Doc V1.26 (XML mode)">
+<link rel="next" href="gst-plugins-ugly-plugins-plugin-x264.html" title="x264">
+<meta name="generator" content="GTK-Doc V1.27 (XML mode)">
<link rel="stylesheet" href="style.css" type="text/css">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -17,19 +17,19 @@
<td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
<td><a accesskey="u" href="ch02.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
<td><a accesskey="p" href="gst-plugins-ugly-plugins-plugin-realmedia.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
-<td><a accesskey="n" href="gst-plugins-ugly-plugins-plugin-twolame.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
+<td><a accesskey="n" href="gst-plugins-ugly-plugins-plugin-x264.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
</tr></table>
<div class="refentry">
-<a name="gst-plugins-ugly-plugins-plugin-siddec"></a><div class="titlepage"></div>
+<a name="gst-plugins-ugly-plugins-plugin-sid"></a><div class="titlepage"></div>
<div class="refnamediv"><table width="100%"><tr>
<td valign="top">
-<h2><span class="refentrytitle">siddec</span></h2>
-<p>siddec — <a name="plugin-siddec"></a>Uses libsidplay to decode .sid files</p>
+<h2><span class="refentrytitle">sid</span></h2>
+<p>sid — <a name="plugin-sid"></a>Uses libsidplay to decode .sid files</p>
</td>
<td class="gallery_image" valign="top" align="right"></td>
</tr></table></div>
<div class="refsect1">
-<a name="id-1.3.14.3"></a><h2>Plugin Information</h2>
+<a name="id-1.3.12.3"></a><h2>Plugin Information</h2>
<div class="variablelist"><table border="0" class="variablelist">
<colgroup>
<col align="left" valign="top">
@@ -42,7 +42,7 @@
</tr>
<tr>
<td><p><span class="term">version</span></p></td>
-<td>1.12.4</td>
+<td>1.13.1</td>
</tr>
<tr>
<td><p><span class="term">run-time license</span></p></td>
@@ -60,7 +60,7 @@
</table></div>
</div>
<div class="refsect1">
-<a name="id-1.3.14.4"></a><h2>Elements</h2>
+<a name="id-1.3.12.4"></a><h2>Elements</h2>
<div class="variablelist"><table border="0" class="variablelist">
<colgroup>
<col align="left" valign="top">
@@ -74,6 +74,6 @@
</div>
</div>
<div class="footer">
-<hr>Generated by GTK-Doc V1.26</div>
+<hr>Generated by GTK-Doc V1.27</div>
</body>
</html>
\ No newline at end of file
diff --git a/docs/plugins/html/gst-plugins-ugly-plugins-plugin-twolame.html b/docs/plugins/html/gst-plugins-ugly-plugins-plugin-twolame.html
deleted file mode 100644
index 327110d..0000000
--- a/docs/plugins/html/gst-plugins-ugly-plugins-plugin-twolame.html
+++ /dev/null
@@ -1,79 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>twolame: GStreamer Ugly Plugins 1.0 Plugins Reference Manual</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.79.1">
-<link rel="home" href="index.html" title="GStreamer Ugly Plugins 1.0 Plugins Reference Manual">
-<link rel="up" href="ch02.html" title="gst-plugins-ugly Plugins">
-<link rel="prev" href="gst-plugins-ugly-plugins-plugin-siddec.html" title="siddec">
-<link rel="next" href="gst-plugins-ugly-plugins-plugin-x264.html" title="x264">
-<meta name="generator" content="GTK-Doc V1.26 (XML mode)">
-<link rel="stylesheet" href="style.css" type="text/css">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
-<td width="100%" align="left" class="shortcuts"></td>
-<td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
-<td><a accesskey="u" href="ch02.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
-<td><a accesskey="p" href="gst-plugins-ugly-plugins-plugin-siddec.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
-<td><a accesskey="n" href="gst-plugins-ugly-plugins-plugin-x264.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
-</tr></table>
-<div class="refentry">
-<a name="gst-plugins-ugly-plugins-plugin-twolame"></a><div class="titlepage"></div>
-<div class="refnamediv"><table width="100%"><tr>
-<td valign="top">
-<h2><span class="refentrytitle">twolame</span></h2>
-<p>twolame — <a name="plugin-twolame"></a>Encode MP2s with TwoLAME</p>
-</td>
-<td class="gallery_image" valign="top" align="right"></td>
-</tr></table></div>
-<div class="refsect1">
-<a name="id-1.3.15.3"></a><h2>Plugin Information</h2>
-<div class="variablelist"><table border="0" class="variablelist">
-<colgroup>
-<col align="left" valign="top">
-<col>
-</colgroup>
-<tbody>
-<tr>
-<td><p><span class="term">filename</span></p></td>
-<td>libgsttwolame.so</td>
-</tr>
-<tr>
-<td><p><span class="term">version</span></p></td>
-<td>1.12.4</td>
-</tr>
-<tr>
-<td><p><span class="term">run-time license</span></p></td>
-<td>LGPL</td>
-</tr>
-<tr>
-<td><p><span class="term">package</span></p></td>
-<td>GStreamer Ugly Plug-ins source release</td>
-</tr>
-<tr>
-<td><p><span class="term">origin</span></p></td>
-<td>Unknown package origin</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<div class="refsect1">
-<a name="id-1.3.15.4"></a><h2>Elements</h2>
-<div class="variablelist"><table border="0" class="variablelist">
-<colgroup>
-<col align="left" valign="top">
-<col>
-</colgroup>
-<tbody><tr>
-<td><p><span class="term">twolamemp2enc</span></p></td>
-<td>High-quality free MP2 encoder</td>
-</tr></tbody>
-</table></div>
-</div>
-</div>
-<div class="footer">
-<hr>Generated by GTK-Doc V1.26</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/plugins/html/gst-plugins-ugly-plugins-plugin-x264.html b/docs/plugins/html/gst-plugins-ugly-plugins-plugin-x264.html
index 1250c30..fe3404e 100644
--- a/docs/plugins/html/gst-plugins-ugly-plugins-plugin-x264.html
+++ b/docs/plugins/html/gst-plugins-ugly-plugins-plugin-x264.html
@@ -6,8 +6,8 @@
<meta name="generator" content="DocBook XSL Stylesheets V1.79.1">
<link rel="home" href="index.html" title="GStreamer Ugly Plugins 1.0 Plugins Reference Manual">
<link rel="up" href="ch02.html" title="gst-plugins-ugly Plugins">
-<link rel="prev" href="gst-plugins-ugly-plugins-plugin-twolame.html" title="twolame">
-<meta name="generator" content="GTK-Doc V1.26 (XML mode)">
+<link rel="prev" href="gst-plugins-ugly-plugins-plugin-sid.html" title="sid">
+<meta name="generator" content="GTK-Doc V1.27 (XML mode)">
<link rel="stylesheet" href="style.css" type="text/css">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -15,7 +15,7 @@
<td width="100%" align="left" class="shortcuts"></td>
<td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
<td><a accesskey="u" href="ch02.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
-<td><a accesskey="p" href="gst-plugins-ugly-plugins-plugin-twolame.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="p" href="gst-plugins-ugly-plugins-plugin-sid.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
<td><img src="right-insensitive.png" width="16" height="16" border="0"></td>
</tr></table>
<div class="refentry">
@@ -28,7 +28,7 @@
<td class="gallery_image" valign="top" align="right"></td>
</tr></table></div>
<div class="refsect1">
-<a name="id-1.3.16.3"></a><h2>Plugin Information</h2>
+<a name="id-1.3.13.3"></a><h2>Plugin Information</h2>
<div class="variablelist"><table border="0" class="variablelist">
<colgroup>
<col align="left" valign="top">
@@ -41,7 +41,7 @@
</tr>
<tr>
<td><p><span class="term">version</span></p></td>
-<td>1.12.4</td>
+<td>1.13.1</td>
</tr>
<tr>
<td><p><span class="term">run-time license</span></p></td>
@@ -59,7 +59,7 @@
</table></div>
</div>
<div class="refsect1">
-<a name="id-1.3.16.4"></a><h2>Elements</h2>
+<a name="id-1.3.13.4"></a><h2>Elements</h2>
<div class="variablelist"><table border="0" class="variablelist">
<colgroup>
<col align="left" valign="top">
@@ -73,6 +73,6 @@
</div>
</div>
<div class="footer">
-<hr>Generated by GTK-Doc V1.26</div>
+<hr>Generated by GTK-Doc V1.27</div>
</body>
</html>
\ No newline at end of file
diff --git a/docs/plugins/html/gst-plugins-ugly-plugins-rademux.html b/docs/plugins/html/gst-plugins-ugly-plugins-rademux.html
index 3c37919..8a99304 100644
--- a/docs/plugins/html/gst-plugins-ugly-plugins-rademux.html
+++ b/docs/plugins/html/gst-plugins-ugly-plugins-rademux.html
@@ -6,9 +6,9 @@
<meta name="generator" content="DocBook XSL Stylesheets V1.79.1">
<link rel="home" href="index.html" title="GStreamer Ugly Plugins 1.0 Plugins Reference Manual">
<link rel="up" href="ch01.html" title="gst-plugins-ugly Elements">
-<link rel="prev" href="gst-plugins-ugly-plugins-mpg123audiodec.html" title="mpg123audiodec">
+<link rel="prev" href="gst-plugins-ugly-plugins-cdiocddasrc.html" title="cdiocddasrc">
<link rel="next" href="gst-plugins-ugly-plugins-rmdemux.html" title="rmdemux">
-<meta name="generator" content="GTK-Doc V1.26 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.27 (XML mode)">
<link rel="stylesheet" href="style.css" type="text/css">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -20,7 +20,7 @@
</td>
<td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
<td><a accesskey="u" href="ch01.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
-<td><a accesskey="p" href="gst-plugins-ugly-plugins-mpg123audiodec.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="p" href="gst-plugins-ugly-plugins-cdiocddasrc.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
<td><a accesskey="n" href="gst-plugins-ugly-plugins-rmdemux.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
</tr></table>
<div class="refentry">
@@ -58,7 +58,7 @@
<a name="gst-plugins-ugly-plugins-rademux.description"></a><h2>Description</h2>
<p>Demuxes/parses a RealAudio (.ra) file or stream into compressed audio.</p>
<div class="refsect2">
-<a name="id-1.2.9.6.3"></a><h3>Example launch line</h3>
+<a name="id-1.2.7.6.3"></a><h3>Example launch line</h3>
<div class="informalexample">
<table class="listing_frame" border="0" cellpadding="0" cellspacing="0">
<tbody>
@@ -87,7 +87,7 @@
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="id-1.2.9.6.4.1"></a><h3>Element Information</h3>
+<a name="id-1.2.7.6.4.1"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0" class="variablelist">
<colgroup>
<col align="left" valign="top">
@@ -113,7 +113,7 @@
</div>
<hr>
<div class="refsect2">
-<a name="id-1.2.9.6.4.2"></a><h3>Element Pads</h3>
+<a name="id-1.2.7.6.4.2"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0" class="variablelist">
<colgroup>
<col align="left" valign="top">
@@ -178,6 +178,6 @@
</div>
</div>
<div class="footer">
-<hr>Generated by GTK-Doc V1.26</div>
+<hr>Generated by GTK-Doc V1.27</div>
</body>
</html>
\ No newline at end of file
diff --git a/docs/plugins/html/gst-plugins-ugly-plugins-rdtmanager.html b/docs/plugins/html/gst-plugins-ugly-plugins-rdtmanager.html
index 7bc1d3f..d92a020 100644
--- a/docs/plugins/html/gst-plugins-ugly-plugins-rdtmanager.html
+++ b/docs/plugins/html/gst-plugins-ugly-plugins-rdtmanager.html
@@ -8,7 +8,7 @@
<link rel="up" href="ch01.html" title="gst-plugins-ugly Elements">
<link rel="prev" href="gst-plugins-ugly-plugins-rmdemux.html" title="rmdemux">
<link rel="next" href="gst-plugins-ugly-plugins-rtspreal.html" title="rtspreal">
-<meta name="generator" content="GTK-Doc V1.26 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.27 (XML mode)">
<link rel="stylesheet" href="style.css" type="text/css">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -120,7 +120,7 @@
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="id-1.2.11.8.3.1"></a><h3>Element Information</h3>
+<a name="id-1.2.9.8.3.1"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0" class="variablelist">
<colgroup>
<col align="left" valign="top">
@@ -146,7 +146,7 @@
</div>
<hr>
<div class="refsect2">
-<a name="id-1.2.11.8.3.2"></a><h3>Element Pads</h3>
+<a name="id-1.2.9.8.3.2"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0" class="variablelist">
<colgroup>
<col align="left" valign="top">
@@ -524,6 +524,6 @@
</div>
</div>
<div class="footer">
-<hr>Generated by GTK-Doc V1.26</div>
+<hr>Generated by GTK-Doc V1.27</div>
</body>
</html>
\ No newline at end of file
diff --git a/docs/plugins/html/gst-plugins-ugly-plugins-rmdemux.html b/docs/plugins/html/gst-plugins-ugly-plugins-rmdemux.html
index 9bf2cb7..179d9bc 100644
--- a/docs/plugins/html/gst-plugins-ugly-plugins-rmdemux.html
+++ b/docs/plugins/html/gst-plugins-ugly-plugins-rmdemux.html
@@ -8,7 +8,7 @@
<link rel="up" href="ch01.html" title="gst-plugins-ugly Elements">
<link rel="prev" href="gst-plugins-ugly-plugins-rademux.html" title="rademux">
<link rel="next" href="gst-plugins-ugly-plugins-rdtmanager.html" title="rdtmanager">
-<meta name="generator" content="GTK-Doc V1.26 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.27 (XML mode)">
<link rel="stylesheet" href="style.css" type="text/css">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -59,7 +59,7 @@
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="id-1.2.10.6.2.1"></a><h3>Element Information</h3>
+<a name="id-1.2.8.6.2.1"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0" class="variablelist">
<colgroup>
<col align="left" valign="top">
@@ -85,7 +85,7 @@
</div>
<hr>
<div class="refsect2">
-<a name="id-1.2.10.6.2.2"></a><h3>Element Pads</h3>
+<a name="id-1.2.8.6.2.2"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0" class="variablelist">
<colgroup>
<col align="left" valign="top">
@@ -174,6 +174,6 @@
</div>
</div>
<div class="footer">
-<hr>Generated by GTK-Doc V1.26</div>
+<hr>Generated by GTK-Doc V1.27</div>
</body>
</html>
\ No newline at end of file
diff --git a/docs/plugins/html/gst-plugins-ugly-plugins-rtspreal.html b/docs/plugins/html/gst-plugins-ugly-plugins-rtspreal.html
index 278d9eb..e17142e 100644
--- a/docs/plugins/html/gst-plugins-ugly-plugins-rtspreal.html
+++ b/docs/plugins/html/gst-plugins-ugly-plugins-rtspreal.html
@@ -8,7 +8,7 @@
<link rel="up" href="ch01.html" title="gst-plugins-ugly Elements">
<link rel="prev" href="gst-plugins-ugly-plugins-rdtmanager.html" title="rdtmanager">
<link rel="next" href="gst-plugins-ugly-plugins-rtspwms.html" title="rtspwms">
-<meta name="generator" content="GTK-Doc V1.26 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.27 (XML mode)">
<link rel="stylesheet" href="style.css" type="text/css">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -67,7 +67,7 @@
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="id-1.2.12.7.3.1"></a><h3>Element Information</h3>
+<a name="id-1.2.10.7.3.1"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0" class="variablelist">
<colgroup>
<col align="left" valign="top">
@@ -93,7 +93,7 @@
</div>
<hr>
<div class="refsect2">
-<a name="id-1.2.12.7.3.2"></a><h3>Element Pads</h3>
+<a name="id-1.2.10.7.3.2"></a><h3>Element Pads</h3>
</div>
</div>
</div>
@@ -110,6 +110,6 @@
</div>
</div>
<div class="footer">
-<hr>Generated by GTK-Doc V1.26</div>
+<hr>Generated by GTK-Doc V1.27</div>
</body>
</html>
\ No newline at end of file
diff --git a/docs/plugins/html/gst-plugins-ugly-plugins-rtspwms.html b/docs/plugins/html/gst-plugins-ugly-plugins-rtspwms.html
index b01add6..184f48b 100644
--- a/docs/plugins/html/gst-plugins-ugly-plugins-rtspwms.html
+++ b/docs/plugins/html/gst-plugins-ugly-plugins-rtspwms.html
@@ -8,7 +8,7 @@
<link rel="up" href="ch01.html" title="gst-plugins-ugly Elements">
<link rel="prev" href="gst-plugins-ugly-plugins-rtspreal.html" title="rtspreal">
<link rel="next" href="gst-plugins-ugly-plugins-siddec.html" title="siddec">
-<meta name="generator" content="GTK-Doc V1.26 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.27 (XML mode)">
<link rel="stylesheet" href="style.css" type="text/css">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -67,7 +67,7 @@
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="id-1.2.13.7.3.1"></a><h3>Element Information</h3>
+<a name="id-1.2.11.7.3.1"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0" class="variablelist">
<colgroup>
<col align="left" valign="top">
@@ -93,7 +93,7 @@
</div>
<hr>
<div class="refsect2">
-<a name="id-1.2.13.7.3.2"></a><h3>Element Pads</h3>
+<a name="id-1.2.11.7.3.2"></a><h3>Element Pads</h3>
</div>
</div>
</div>
@@ -110,6 +110,6 @@
</div>
</div>
<div class="footer">
-<hr>Generated by GTK-Doc V1.26</div>
+<hr>Generated by GTK-Doc V1.27</div>
</body>
</html>
\ No newline at end of file
diff --git a/docs/plugins/html/gst-plugins-ugly-plugins-siddec.html b/docs/plugins/html/gst-plugins-ugly-plugins-siddec.html
index 54d9909..d26b35b 100644
--- a/docs/plugins/html/gst-plugins-ugly-plugins-siddec.html
+++ b/docs/plugins/html/gst-plugins-ugly-plugins-siddec.html
@@ -7,8 +7,8 @@
<link rel="home" href="index.html" title="GStreamer Ugly Plugins 1.0 Plugins Reference Manual">
<link rel="up" href="ch01.html" title="gst-plugins-ugly Elements">
<link rel="prev" href="gst-plugins-ugly-plugins-rtspwms.html" title="rtspwms">
-<link rel="next" href="gst-plugins-ugly-plugins-twolame.html" title="twolame">
-<meta name="generator" content="GTK-Doc V1.26 (XML mode)">
+<link rel="next" href="gst-plugins-ugly-plugins-x264enc.html" title="x264enc">
+<meta name="generator" content="GTK-Doc V1.27 (XML mode)">
<link rel="stylesheet" href="style.css" type="text/css">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -22,7 +22,7 @@
<td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
<td><a accesskey="u" href="ch01.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
<td><a accesskey="p" href="gst-plugins-ugly-plugins-rtspwms.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
-<td><a accesskey="n" href="gst-plugins-ugly-plugins-twolame.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
+<td><a accesskey="n" href="gst-plugins-ugly-plugins-x264enc.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
</tr></table>
<div class="refentry">
<a name="gst-plugins-ugly-plugins-siddec"></a><div class="titlepage"></div>
@@ -122,7 +122,7 @@
the emulator and producing output.</p>
<p>Seeking is not (and cannot be) implemented.</p>
<div class="refsect2">
-<a name="id-1.2.14.7.5"></a><h3>Example pipelines</h3>
+<a name="id-1.2.12.7.5"></a><h3>Example pipelines</h3>
<div class="informalexample">
<table class="listing_frame" border="0" cellpadding="0" cellspacing="0">
<tbody>
@@ -138,7 +138,7 @@
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="id-1.2.14.7.6.1"></a><h3>Element Information</h3>
+<a name="id-1.2.12.7.6.1"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0" class="variablelist">
<colgroup>
<col align="left" valign="top">
@@ -148,7 +148,7 @@
<tr>
<td><p><span class="term">plugin</span></p></td>
<td>
- <a class="link" href="gst-plugins-ugly-plugins-plugin-siddec.html#plugin-siddec">siddec</a>
+ <a class="link" href="gst-plugins-ugly-plugins-plugin-sid.html#plugin-sid">sid</a>
</td>
</tr>
<tr>
@@ -164,7 +164,7 @@
</div>
<hr>
<div class="refsect2">
-<a name="id-1.2.14.7.6.2"></a><h3>Element Pads</h3>
+<a name="id-1.2.12.7.6.2"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0" class="variablelist">
<colgroup>
<col align="left" valign="top">
@@ -304,6 +304,6 @@
</div>
</div>
<div class="footer">
-<hr>Generated by GTK-Doc V1.26</div>
+<hr>Generated by GTK-Doc V1.27</div>
</body>
</html>
\ No newline at end of file
diff --git a/docs/plugins/html/gst-plugins-ugly-plugins-twolame.html b/docs/plugins/html/gst-plugins-ugly-plugins-twolame.html
deleted file mode 100644
index ba04b7e..0000000
--- a/docs/plugins/html/gst-plugins-ugly-plugins-twolame.html
+++ /dev/null
@@ -1,383 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>twolame: GStreamer Ugly Plugins 1.0 Plugins Reference Manual</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.79.1">
-<link rel="home" href="index.html" title="GStreamer Ugly Plugins 1.0 Plugins Reference Manual">
-<link rel="up" href="ch01.html" title="gst-plugins-ugly Elements">
-<link rel="prev" href="gst-plugins-ugly-plugins-siddec.html" title="siddec">
-<link rel="next" href="gst-plugins-ugly-plugins-x264enc.html" title="x264enc">
-<meta name="generator" content="GTK-Doc V1.26 (XML mode)">
-<link rel="stylesheet" href="style.css" type="text/css">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
-<td width="100%" align="left" class="shortcuts">
-<a href="#" class="shortcut">Top</a><span id="nav_description"> <span class="dim">|</span>
- <a href="#gst-plugins-ugly-plugins-twolame.description" class="shortcut">Description</a></span><span id="nav_hierarchy"> <span class="dim">|</span>
- <a href="#gst-plugins-ugly-plugins-twolame.object-hierarchy" class="shortcut">Object Hierarchy</a></span><span id="nav_interfaces"> <span class="dim">|</span>
- <a href="#gst-plugins-ugly-plugins-twolame.implemented-interfaces" class="shortcut">Implemented Interfaces</a></span><span id="nav_properties"> <span class="dim">|</span>
- <a href="#gst-plugins-ugly-plugins-twolame.properties" class="shortcut">Properties</a></span>
-</td>
-<td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
-<td><a accesskey="u" href="ch01.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
-<td><a accesskey="p" href="gst-plugins-ugly-plugins-siddec.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
-<td><a accesskey="n" href="gst-plugins-ugly-plugins-x264enc.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
-</tr></table>
-<div class="refentry">
-<a name="gst-plugins-ugly-plugins-twolame"></a><div class="titlepage"></div>
-<div class="refnamediv"><table width="100%"><tr>
-<td valign="top">
-<h2><span class="refentrytitle"><a name="gst-plugins-ugly-plugins-twolame.top_of_page"></a>twolame</span></h2>
-<p>twolame</p>
-</td>
-<td class="gallery_image" valign="top" align="right"></td>
-</tr></table></div>
-<div class="refsect1">
-<a name="gst-plugins-ugly-plugins-twolame.properties"></a><h2>Properties</h2>
-<div class="informaltable"><table class="informaltable" border="0">
-<colgroup>
-<col width="150px" class="properties_type">
-<col width="300px" class="properties_name">
-<col width="200px" class="properties_flags">
-</colgroup>
-<tbody>
-<tr>
-<td class="property_type"><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gfloat"><span class="type">gfloat</span></a></td>
-<td class="property_name"><a class="link" href="gst-plugins-ugly-plugins-twolame.html#GstTwoLame--ath-level" title="The “ath-level” property">ath-level</a></td>
-<td class="property_flags">Read / Write</td>
-</tr>
-<tr>
-<td class="property_type"><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"><span class="type">gint</span></a></td>
-<td class="property_name"><a class="link" href="gst-plugins-ugly-plugins-twolame.html#GstTwoLame--bitrate" title="The “bitrate” property">bitrate</a></td>
-<td class="property_flags">Read / Write</td>
-</tr>
-<tr>
-<td class="property_type"><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a></td>
-<td class="property_name"><a class="link" href="gst-plugins-ugly-plugins-twolame.html#GstTwoLame--copyright" title="The “copyright” property">copyright</a></td>
-<td class="property_flags">Read / Write</td>
-</tr>
-<tr>
-<td class="property_type"><span class="type">GstTwoLameEmphasis</span></td>
-<td class="property_name"><a class="link" href="gst-plugins-ugly-plugins-twolame.html#GstTwoLame--emphasis" title="The “emphasis” property">emphasis</a></td>
-<td class="property_flags">Read / Write</td>
-</tr>
-<tr>
-<td class="property_type"><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a></td>
-<td class="property_name"><a class="link" href="gst-plugins-ugly-plugins-twolame.html#GstTwoLame--energy-level-extension" title="The “energy-level-extension” property">energy-level-extension</a></td>
-<td class="property_flags">Read / Write</td>
-</tr>
-<tr>
-<td class="property_type"><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a></td>
-<td class="property_name"><a class="link" href="gst-plugins-ugly-plugins-twolame.html#GstTwoLame--error-protection" title="The “error-protection” property">error-protection</a></td>
-<td class="property_flags">Read / Write</td>
-</tr>
-<tr>
-<td class="property_type"><span class="type">GstTwoLameMode</span></td>
-<td class="property_name"><a class="link" href="gst-plugins-ugly-plugins-twolame.html#GstTwoLame--mode" title="The “mode” property">mode</a></td>
-<td class="property_flags">Read / Write</td>
-</tr>
-<tr>
-<td class="property_type"><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a></td>
-<td class="property_name"><a class="link" href="gst-plugins-ugly-plugins-twolame.html#GstTwoLame--original" title="The “original” property">original</a></td>
-<td class="property_flags">Read / Write</td>
-</tr>
-<tr>
-<td class="property_type"><span class="type">GstTwoLamePadding</span></td>
-<td class="property_name"><a class="link" href="gst-plugins-ugly-plugins-twolame.html#GstTwoLame--padding" title="The “padding” property">padding</a></td>
-<td class="property_flags">Read / Write</td>
-</tr>
-<tr>
-<td class="property_type"><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"><span class="type">gint</span></a></td>
-<td class="property_name"><a class="link" href="gst-plugins-ugly-plugins-twolame.html#GstTwoLame--psymodel" title="The “psymodel” property">psymodel</a></td>
-<td class="property_flags">Read / Write</td>
-</tr>
-<tr>
-<td class="property_type"><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a></td>
-<td class="property_name"><a class="link" href="gst-plugins-ugly-plugins-twolame.html#GstTwoLame--quick-mode" title="The “quick-mode” property">quick-mode</a></td>
-<td class="property_flags">Read / Write</td>
-</tr>
-<tr>
-<td class="property_type"><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"><span class="type">gint</span></a></td>
-<td class="property_name"><a class="link" href="gst-plugins-ugly-plugins-twolame.html#GstTwoLame--quick-mode-count" title="The “quick-mode-count” property">quick-mode-count</a></td>
-<td class="property_flags">Read / Write</td>
-</tr>
-<tr>
-<td class="property_type"><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a></td>
-<td class="property_name"><a class="link" href="gst-plugins-ugly-plugins-twolame.html#GstTwoLame--vbr" title="The “vbr” property">vbr</a></td>
-<td class="property_flags">Read / Write</td>
-</tr>
-<tr>
-<td class="property_type"><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gfloat"><span class="type">gfloat</span></a></td>
-<td class="property_name"><a class="link" href="gst-plugins-ugly-plugins-twolame.html#GstTwoLame--vbr-level" title="The “vbr-level” property">vbr-level</a></td>
-<td class="property_flags">Read / Write</td>
-</tr>
-<tr>
-<td class="property_type"><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"><span class="type">gint</span></a></td>
-<td class="property_name"><a class="link" href="gst-plugins-ugly-plugins-twolame.html#GstTwoLame--vbr-max-bitrate" title="The “vbr-max-bitrate” property">vbr-max-bitrate</a></td>
-<td class="property_flags">Read / Write</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<a name="GstTwoLame"></a><div class="refsect1">
-<a name="gst-plugins-ugly-plugins-twolame.other"></a><h2>Types and Values</h2>
-<div class="informaltable"><table class="informaltable" width="100%" border="0">
-<colgroup>
-<col width="150px" class="name">
-<col class="description">
-</colgroup>
-<tbody><tr>
-<td class="datatype_keyword">struct</td>
-<td class="function_name"><a class="link" href="gst-plugins-ugly-plugins-twolame.html#GstTwoLame-struct" title="struct GstTwoLame">GstTwoLame</a></td>
-</tr></tbody>
-</table></div>
-</div>
-<div class="refsect1">
-<a name="gst-plugins-ugly-plugins-twolame.object-hierarchy"></a><h2>Object Hierarchy</h2>
-<pre class="screen"> <a href="/usr/share/gtk-doc/html/gobject/gobject-The-Base-Object-Type.html#GObject-struct">GObject</a>
- <span class="lineart">╰──</span> <a href="/usr/share/gtk-doc/html/gobject/gobject-The-Base-Object-Type.html#GInitiallyUnowned">GInitiallyUnowned</a>
- <span class="lineart">╰──</span> <a href="/usr/share/gtk-doc/html/gstreamer-1.0/GstObject.html#GstObject-struct">GstObject</a>
- <span class="lineart">╰──</span> <a href="/usr/share/gtk-doc/html/gstreamer-1.0/GstElement.html#GstElement-struct">GstElement</a>
- <span class="lineart">╰──</span> <a href="/usr/share/gtk-doc/html/gst-plugins-base-libs-1.0/GstAudioEncoder.html#GstAudioEncoder-struct">GstAudioEncoder</a>
- <span class="lineart">╰──</span> GstTwoLame
-</pre>
-</div>
-<div class="refsect1">
-<a name="gst-plugins-ugly-plugins-twolame.implemented-interfaces"></a><h2>Implemented Interfaces</h2>
-<p>
-GstTwoLame implements
- <a href="/usr/share/gtk-doc/html/gstreamer-1.0/GstPreset.html#GstPreset-struct">GstPreset</a>.</p>
-</div>
-<div class="refsect1">
-<a name="gst-plugins-ugly-plugins-twolame.description"></a><h2>Description</h2>
-<div class="refsynopsisdiv">
-<h2>Synopsis</h2>
-<div class="refsect2">
-<a name="id-1.2.15.8.2.1"></a><h3>Element Information</h3>
-<div class="variablelist"><table border="0" class="variablelist">
-<colgroup>
-<col align="left" valign="top">
-<col>
-</colgroup>
-<tbody>
-<tr>
-<td><p><span class="term">plugin</span></p></td>
-<td>
- <a class="link" href="gst-plugins-ugly-plugins-plugin-twolame.html#plugin-twolame">twolame</a>
- </td>
-</tr>
-<tr>
-<td><p><span class="term">author</span></p></td>
-<td>Sebastian Dröge <sebastian.droege@collabora.co.uk></td>
-</tr>
-<tr>
-<td><p><span class="term">class</span></p></td>
-<td>Codec/Encoder/Audio</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2">
-<a name="id-1.2.15.8.2.2"></a><h3>Element Pads</h3>
-<div class="variablelist"><table border="0" class="variablelist">
-<colgroup>
-<col align="left" valign="top">
-<col>
-</colgroup>
-<tbody>
-<tr>
-<td><p><span class="term">name</span></p></td>
-<td>sink</td>
-</tr>
-<tr>
-<td><p><span class="term">direction</span></p></td>
-<td>sink</td>
-</tr>
-<tr>
-<td><p><span class="term">presence</span></p></td>
-<td>always</td>
-</tr>
-<tr>
-<td><p><span class="term">details</span></p></td>
-<td>audio/x-raw, format=(string){ F32LE, S16LE }, layout=(string)interleaved, rate=(int){ 16000, 22050, 24000, 32000, 44100, 48000 }, channels=(int)1</td>
-</tr>
-<tr>
-<td><p><span class="term"></span></p></td>
-<td> audio/x-raw, format=(string){ F32LE, S16LE }, layout=(string)interleaved, rate=(int){ 16000, 22050, 24000, 32000, 44100, 48000 }, channels=(int)2, channel-mask=(bitmask)0x0000000000000003</td>
-</tr>
-</tbody>
-</table></div>
-<div class="variablelist"><table border="0" class="variablelist">
-<colgroup>
-<col align="left" valign="top">
-<col>
-</colgroup>
-<tbody>
-<tr>
-<td><p><span class="term">name</span></p></td>
-<td>src</td>
-</tr>
-<tr>
-<td><p><span class="term">direction</span></p></td>
-<td>source</td>
-</tr>
-<tr>
-<td><p><span class="term">presence</span></p></td>
-<td>always</td>
-</tr>
-<tr>
-<td><p><span class="term">details</span></p></td>
-<td>audio/mpeg, mpegversion=(int)1, layer=(int)2, rate=(int){ 16000, 22050, 24000, 32000, 44100, 48000 }, channels=(int)[ 1, 2 ]</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-</div>
-</div>
-<div class="refsect1">
-<a name="gst-plugins-ugly-plugins-twolame.functions_details"></a><h2>Functions</h2>
-<p></p>
-</div>
-<div class="refsect1">
-<a name="gst-plugins-ugly-plugins-twolame.other_details"></a><h2>Types and Values</h2>
-<div class="refsect2">
-<a name="GstTwoLame-struct"></a><h3>struct GstTwoLame</h3>
-<pre class="programlisting">struct GstTwoLame;</pre>
-<p>Opaque data structure.</p>
-</div>
-</div>
-<div class="refsect1">
-<a name="gst-plugins-ugly-plugins-twolame.property-details"></a><h2>Property Details</h2>
-<div class="refsect2">
-<a name="GstTwoLame--ath-level"></a><h3>The <code class="literal">“ath-level”</code> property</h3>
-<pre class="programlisting"> “ath-level” <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gfloat"><span class="type">gfloat</span></a></pre>
-<p>ATH Level in dB.</p>
-<p>Flags: Read / Write</p>
-<p>Default value: 0</p>
-</div>
-<hr>
-<div class="refsect2">
-<a name="GstTwoLame--bitrate"></a><h3>The <code class="literal">“bitrate”</code> property</h3>
-<pre class="programlisting"> “bitrate” <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"><span class="type">gint</span></a></pre>
-<p>Bitrate in kbit/sec (8, 16, 24, 32, 40, 48, 56, 64, 80, 96, 112, 128, 144, 160, 192, 224, 256, 320, 384).</p>
-<p>Flags: Read / Write</p>
-<p>Allowed values: [8,384]</p>
-<p>Default value: 192</p>
-</div>
-<hr>
-<div class="refsect2">
-<a name="GstTwoLame--copyright"></a><h3>The <code class="literal">“copyright”</code> property</h3>
-<pre class="programlisting"> “copyright” <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a></pre>
-<p>Mark as copyright.</p>
-<p>Flags: Read / Write</p>
-<p>Default value: FALSE</p>
-</div>
-<hr>
-<div class="refsect2">
-<a name="GstTwoLame--emphasis"></a><h3>The <code class="literal">“emphasis”</code> property</h3>
-<pre class="programlisting"> “emphasis” <span class="type">GstTwoLameEmphasis</span></pre>
-<p>Pre-emphasis to apply to the decoded audio.</p>
-<p>Flags: Read / Write</p>
-<p>Default value: No emphasis</p>
-</div>
-<hr>
-<div class="refsect2">
-<a name="GstTwoLame--energy-level-extension"></a><h3>The <code class="literal">“energy-level-extension”</code> property</h3>
-<pre class="programlisting"> “energy-level-extension” <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a></pre>
-<p>Write peak PCM level to each frame.</p>
-<p>Flags: Read / Write</p>
-<p>Default value: FALSE</p>
-</div>
-<hr>
-<div class="refsect2">
-<a name="GstTwoLame--error-protection"></a><h3>The <code class="literal">“error-protection”</code> property</h3>
-<pre class="programlisting"> “error-protection” <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a></pre>
-<p>Adds checksum to every frame.</p>
-<p>Flags: Read / Write</p>
-<p>Default value: FALSE</p>
-</div>
-<hr>
-<div class="refsect2">
-<a name="GstTwoLame--mode"></a><h3>The <code class="literal">“mode”</code> property</h3>
-<pre class="programlisting"> “mode” <span class="type">GstTwoLameMode</span></pre>
-<p>Encoding mode.</p>
-<p>Flags: Read / Write</p>
-<p>Default value: Joint Stereo</p>
-</div>
-<hr>
-<div class="refsect2">
-<a name="GstTwoLame--original"></a><h3>The <code class="literal">“original”</code> property</h3>
-<pre class="programlisting"> “original” <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a></pre>
-<p>Mark as original.</p>
-<p>Flags: Read / Write</p>
-<p>Default value: TRUE</p>
-</div>
-<hr>
-<div class="refsect2">
-<a name="GstTwoLame--padding"></a><h3>The <code class="literal">“padding”</code> property</h3>
-<pre class="programlisting"> “padding” <span class="type">GstTwoLamePadding</span></pre>
-<p>Padding type.</p>
-<p>Flags: Read / Write</p>
-<p>Default value: No Padding</p>
-</div>
-<hr>
-<div class="refsect2">
-<a name="GstTwoLame--psymodel"></a><h3>The <code class="literal">“psymodel”</code> property</h3>
-<pre class="programlisting"> “psymodel” <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"><span class="type">gint</span></a></pre>
-<p>Psychoacoustic model used to encode the audio.</p>
-<p>Flags: Read / Write</p>
-<p>Allowed values: [G_MAXULONG,4]</p>
-<p>Default value: 3</p>
-</div>
-<hr>
-<div class="refsect2">
-<a name="GstTwoLame--quick-mode"></a><h3>The <code class="literal">“quick-mode”</code> property</h3>
-<pre class="programlisting"> “quick-mode” <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a></pre>
-<p>Calculate Psymodel every frames.</p>
-<p>Flags: Read / Write</p>
-<p>Default value: FALSE</p>
-</div>
-<hr>
-<div class="refsect2">
-<a name="GstTwoLame--quick-mode-count"></a><h3>The <code class="literal">“quick-mode-count”</code> property</h3>
-<pre class="programlisting"> “quick-mode-count” <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"><span class="type">gint</span></a></pre>
-<p>Calculate Psymodel every n frames.</p>
-<p>Flags: Read / Write</p>
-<p>Allowed values: >= 0</p>
-<p>Default value: 10</p>
-</div>
-<hr>
-<div class="refsect2">
-<a name="GstTwoLame--vbr"></a><h3>The <code class="literal">“vbr”</code> property</h3>
-<pre class="programlisting"> “vbr” <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a></pre>
-<p>Enable variable bitrate mode.</p>
-<p>Flags: Read / Write</p>
-<p>Default value: FALSE</p>
-</div>
-<hr>
-<div class="refsect2">
-<a name="GstTwoLame--vbr-level"></a><h3>The <code class="literal">“vbr-level”</code> property</h3>
-<pre class="programlisting"> “vbr-level” <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gfloat"><span class="type">gfloat</span></a></pre>
-<p>VBR Level.</p>
-<p>Flags: Read / Write</p>
-<p>Allowed values: [-10,10]</p>
-<p>Default value: 5</p>
-</div>
-<hr>
-<div class="refsect2">
-<a name="GstTwoLame--vbr-max-bitrate"></a><h3>The <code class="literal">“vbr-max-bitrate”</code> property</h3>
-<pre class="programlisting"> “vbr-max-bitrate” <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"><span class="type">gint</span></a></pre>
-<p>Specify maximum VBR bitrate (0=off, 8, 16, 24, 32, 40, 48, 56, 64, 80, 96, 112, 128, 144, 160, 192, 224, 256, 320, 384).</p>
-<p>Flags: Read / Write</p>
-<p>Allowed values: [0,384]</p>
-<p>Default value: 0</p>
-</div>
-</div>
-</div>
-<div class="footer">
-<hr>Generated by GTK-Doc V1.26</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/plugins/html/gst-plugins-ugly-plugins-x264enc.html b/docs/plugins/html/gst-plugins-ugly-plugins-x264enc.html
index f0170bf..a71dce6 100644
--- a/docs/plugins/html/gst-plugins-ugly-plugins-x264enc.html
+++ b/docs/plugins/html/gst-plugins-ugly-plugins-x264enc.html
@@ -6,9 +6,9 @@
<meta name="generator" content="DocBook XSL Stylesheets V1.79.1">
<link rel="home" href="index.html" title="GStreamer Ugly Plugins 1.0 Plugins Reference Manual">
<link rel="up" href="ch01.html" title="gst-plugins-ugly Elements">
-<link rel="prev" href="gst-plugins-ugly-plugins-twolame.html" title="twolame">
+<link rel="prev" href="gst-plugins-ugly-plugins-siddec.html" title="siddec">
<link rel="next" href="gst-plugins-ugly-plugins-xingmux.html" title="xingmux">
-<meta name="generator" content="GTK-Doc V1.26 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.27 (XML mode)">
<link rel="stylesheet" href="style.css" type="text/css">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -22,7 +22,7 @@
</td>
<td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
<td><a accesskey="u" href="ch01.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
-<td><a accesskey="p" href="gst-plugins-ugly-plugins-twolame.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><a accesskey="p" href="gst-plugins-ugly-plugins-siddec.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
<td><a accesskey="n" href="gst-plugins-ugly-plugins-xingmux.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
</tr></table>
<div class="refentry">
@@ -246,6 +246,11 @@
<td class="property_name"><a class="link" href="gst-plugins-ugly-plugins-x264enc.html#GstX264Enc--frame-packing" title="The “frame-packing” property">frame-packing</a></td>
<td class="property_flags">Read / Write</td>
</tr>
+<tr>
+<td class="property_type"><a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a></td>
+<td class="property_name"><a class="link" href="gst-plugins-ugly-plugins-x264enc.html#GstX264Enc--insert-vui" title="The “insert-vui” property">insert-vui</a></td>
+<td class="property_flags">Read / Write</td>
+</tr>
</tbody>
</table></div>
</div>
@@ -314,7 +319,7 @@
overall encoding quality so may not be appropriate for your use case.
</div>
<div class="refsect2">
-<a name="id-1.2.16.8.7"></a><h3>Example pipeline</h3>
+<a name="id-1.2.13.8.7"></a><h3>Example pipeline</h3>
<div class="informalexample">
<table class="listing_frame" border="0" cellpadding="0" cellspacing="0">
<tbody>
@@ -383,7 +388,7 @@
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="id-1.2.16.8.8.1"></a><h3>Element Information</h3>
+<a name="id-1.2.13.8.8.1"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0" class="variablelist">
<colgroup>
<col align="left" valign="top">
@@ -409,7 +414,7 @@
</div>
<hr>
<div class="refsect2">
-<a name="id-1.2.16.8.8.2"></a><h3>Element Pads</h3>
+<a name="id-1.2.13.8.8.2"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0" class="variablelist">
<colgroup>
<col align="left" valign="top">
@@ -510,7 +515,7 @@
<pre class="programlisting"> “bframes” <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#guint"><span class="type">guint</span></a></pre>
<p>Number of B-frames between I and P.</p>
<p>Flags: Read / Write</p>
-<p>Allowed values: <= 4</p>
+<p>Allowed values: <= 16</p>
<p>Default value: 0</p>
</div>
<hr>
@@ -808,6 +813,14 @@
<p>Flags: Read / Write</p>
<p>Default value: Automatic (use incoming video information)</p>
</div>
+<hr>
+<div class="refsect2">
+<a name="GstX264Enc--insert-vui"></a><h3>The <code class="literal">“insert-vui”</code> property</h3>
+<pre class="programlisting"> “insert-vui” <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a></pre>
+<p>Insert VUI NAL in stream.</p>
+<p>Flags: Read / Write</p>
+<p>Default value: TRUE</p>
+</div>
</div>
<div class="refsect1">
<a name="gst-plugins-ugly-plugins-x264enc.see-also"></a><h2>See Also</h2>
@@ -815,6 +828,6 @@
</div>
</div>
<div class="footer">
-<hr>Generated by GTK-Doc V1.26</div>
+<hr>Generated by GTK-Doc V1.27</div>
</body>
</html>
\ No newline at end of file
diff --git a/docs/plugins/html/gst-plugins-ugly-plugins-xingmux.html b/docs/plugins/html/gst-plugins-ugly-plugins-xingmux.html
index 4285614..5467e69 100644
--- a/docs/plugins/html/gst-plugins-ugly-plugins-xingmux.html
+++ b/docs/plugins/html/gst-plugins-ugly-plugins-xingmux.html
@@ -8,7 +8,7 @@
<link rel="up" href="ch01.html" title="gst-plugins-ugly Elements">
<link rel="prev" href="gst-plugins-ugly-plugins-x264enc.html" title="x264enc">
<link rel="next" href="ch02.html" title="gst-plugins-ugly Plugins">
-<meta name="generator" content="GTK-Doc V1.26 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.27 (XML mode)">
<link rel="stylesheet" href="style.css" type="text/css">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -61,7 +61,7 @@
seeking on VBR MP3 files.</p>
<p>This element will remove any existing Xing, LAME or VBRI headers from the beginning of the file.</p>
<div class="refsect2">
-<a name="id-1.2.17.6.4"></a><h3>Example launch line</h3>
+<a name="id-1.2.14.6.4"></a><h3>Example launch line</h3>
<div class="informalexample">
<table class="listing_frame" border="0" cellpadding="0" cellspacing="0">
<tbody>
@@ -81,7 +81,7 @@
<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="refsect2">
-<a name="id-1.2.17.6.5.1"></a><h3>Element Information</h3>
+<a name="id-1.2.14.6.5.1"></a><h3>Element Information</h3>
<div class="variablelist"><table border="0" class="variablelist">
<colgroup>
<col align="left" valign="top">
@@ -107,7 +107,7 @@
</div>
<hr>
<div class="refsect2">
-<a name="id-1.2.17.6.5.2"></a><h3>Element Pads</h3>
+<a name="id-1.2.14.6.5.2"></a><h3>Element Pads</h3>
<div class="variablelist"><table border="0" class="variablelist">
<colgroup>
<col align="left" valign="top">
@@ -173,6 +173,6 @@
</div>
</div>
<div class="footer">
-<hr>Generated by GTK-Doc V1.26</div>
+<hr>Generated by GTK-Doc V1.27</div>
</body>
</html>
\ No newline at end of file
diff --git a/docs/plugins/html/home.png b/docs/plugins/html/home.png
index 431ab24..b4373be 100644
--- a/docs/plugins/html/home.png
+++ b/docs/plugins/html/home.png
Binary files differ
diff --git a/docs/plugins/html/index.html b/docs/plugins/html/index.html
index 625f5a2..9c7ffc8 100644
--- a/docs/plugins/html/index.html
+++ b/docs/plugins/html/index.html
@@ -6,7 +6,7 @@
<meta name="generator" content="DocBook XSL Stylesheets V1.79.1">
<link rel="home" href="index.html" title="GStreamer Ugly Plugins 1.0 Plugins Reference Manual">
<link rel="next" href="ch01.html" title="gst-plugins-ugly Elements">
-<meta name="generator" content="GTK-Doc V1.26 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.27 (XML mode)">
<link rel="stylesheet" href="style.css" type="text/css">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -15,7 +15,7 @@
<div>
<div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">GStreamer Ugly Plugins 1.0 Plugins Reference Manual</p></th></tr></table></div>
<div><p class="releaseinfo">
- for GStreamer Ugly Plugins 1.0 (1.12.4)
+ for GStreamer Ugly Plugins 1.0 (1.13.1)
The latest version of this documentation can be found on-line at
<a class="ulink" href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gst-plugins-ugly/html/" target="_top">http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gst-plugins-ugly/html/</a>.
</p></div>
@@ -41,12 +41,6 @@
<span class="refentrytitle"><a href="gst-plugins-ugly-plugins-cdiocddasrc.html">cdiocddasrc</a></span><span class="refpurpose"></span>
</dt>
<dt>
-<span class="refentrytitle"><a href="gst-plugins-ugly-plugins-lamemp3enc.html">lamemp3enc</a></span><span class="refpurpose"></span>
-</dt>
-<dt>
-<span class="refentrytitle"><a href="gst-plugins-ugly-plugins-mpg123audiodec.html">mpg123audiodec</a></span><span class="refpurpose"></span>
-</dt>
-<dt>
<span class="refentrytitle"><a href="gst-plugins-ugly-plugins-rademux.html">rademux</a></span><span class="refpurpose"></span>
</dt>
<dt>
@@ -65,9 +59,6 @@
<span class="refentrytitle"><a href="gst-plugins-ugly-plugins-siddec.html">siddec</a></span><span class="refpurpose"></span>
</dt>
<dt>
-<span class="refentrytitle"><a href="gst-plugins-ugly-plugins-twolame.html">twolame</a></span><span class="refpurpose"></span>
-</dt>
-<dt>
<span class="refentrytitle"><a href="gst-plugins-ugly-plugins-x264enc.html">x264enc</a></span><span class="refpurpose"></span>
</dt>
<dt>
@@ -101,22 +92,13 @@
<span class="refentrytitle"><a href="gst-plugins-ugly-plugins-plugin-dvdsub.html">dvdsub</a></span><span class="refpurpose"> — DVD subtitle parser and decoder</span>
</dt>
<dt>
-<span class="refentrytitle"><a href="gst-plugins-ugly-plugins-plugin-lame.html">lame</a></span><span class="refpurpose"> — Encode MP3s with LAME</span>
-</dt>
-<dt>
<span class="refentrytitle"><a href="gst-plugins-ugly-plugins-plugin-mpeg2dec.html">mpeg2dec</a></span><span class="refpurpose"> — LibMpeg2 decoder</span>
</dt>
<dt>
-<span class="refentrytitle"><a href="gst-plugins-ugly-plugins-plugin-mpg123.html">mpg123</a></span><span class="refpurpose"> — mp3 decoding based on the mpg123 library</span>
-</dt>
-<dt>
<span class="refentrytitle"><a href="gst-plugins-ugly-plugins-plugin-realmedia.html">realmedia</a></span><span class="refpurpose"> — RealMedia support plugins</span>
</dt>
<dt>
-<span class="refentrytitle"><a href="gst-plugins-ugly-plugins-plugin-siddec.html">siddec</a></span><span class="refpurpose"> — Uses libsidplay to decode .sid files</span>
-</dt>
-<dt>
-<span class="refentrytitle"><a href="gst-plugins-ugly-plugins-plugin-twolame.html">twolame</a></span><span class="refpurpose"> — Encode MP2s with TwoLAME</span>
+<span class="refentrytitle"><a href="gst-plugins-ugly-plugins-plugin-sid.html">sid</a></span><span class="refpurpose"> — Uses libsidplay to decode .sid files</span>
</dt>
<dt>
<span class="refentrytitle"><a href="gst-plugins-ugly-plugins-plugin-x264.html">x264</a></span><span class="refpurpose"> — libx264-based H264 plugins</span>
@@ -125,6 +107,6 @@
</dl></div>
</div>
<div class="footer">
-<hr>Generated by GTK-Doc V1.26</div>
+<hr>Generated by GTK-Doc V1.27</div>
</body>
</html>
\ No newline at end of file
diff --git a/docs/plugins/html/left-insensitive.png b/docs/plugins/html/left-insensitive.png
index a52885c..a6b5e73 100644
--- a/docs/plugins/html/left-insensitive.png
+++ b/docs/plugins/html/left-insensitive.png
Binary files differ
diff --git a/docs/plugins/html/left.png b/docs/plugins/html/left.png
index 0216ce0..b4eb4ea 100644
--- a/docs/plugins/html/left.png
+++ b/docs/plugins/html/left.png
Binary files differ
diff --git a/docs/plugins/html/right-insensitive.png b/docs/plugins/html/right-insensitive.png
index 857714a..69702d1 100644
--- a/docs/plugins/html/right-insensitive.png
+++ b/docs/plugins/html/right-insensitive.png
Binary files differ
diff --git a/docs/plugins/html/right.png b/docs/plugins/html/right.png
index 2ca36a5..5aef0a9 100644
--- a/docs/plugins/html/right.png
+++ b/docs/plugins/html/right.png
Binary files differ
diff --git a/docs/plugins/html/up-insensitive.png b/docs/plugins/html/up-insensitive.png
index 8b70778..439f8d7 100644
--- a/docs/plugins/html/up-insensitive.png
+++ b/docs/plugins/html/up-insensitive.png
Binary files differ
diff --git a/docs/plugins/html/up.png b/docs/plugins/html/up.png
index b2a80fb..b8bd7bc 100644
--- a/docs/plugins/html/up.png
+++ b/docs/plugins/html/up.png
Binary files differ
diff --git a/docs/plugins/inspect/plugin-a52dec.xml b/docs/plugins/inspect/plugin-a52dec.xml
index 75123b1..5a03bab 100644
--- a/docs/plugins/inspect/plugin-a52dec.xml
+++ b/docs/plugins/inspect/plugin-a52dec.xml
@@ -3,7 +3,7 @@
<description>Decodes ATSC A/52 encoded audio streams</description>
<filename>../../ext/a52dec/.libs/libgsta52dec.so</filename>
<basename>libgsta52dec.so</basename>
- <version>1.12.4</version>
+ <version>1.13.1</version>
<license>GPL</license>
<source>gst-plugins-ugly</source>
<package>GStreamer Ugly Plug-ins source release</package>
diff --git a/docs/plugins/inspect/plugin-amrnb.xml b/docs/plugins/inspect/plugin-amrnb.xml
index 3c6a0df..3f6df34 100644
--- a/docs/plugins/inspect/plugin-amrnb.xml
+++ b/docs/plugins/inspect/plugin-amrnb.xml
@@ -3,7 +3,7 @@
<description>Adaptive Multi-Rate Narrow-Band</description>
<filename>../../ext/amrnb/.libs/libgstamrnb.so</filename>
<basename>libgstamrnb.so</basename>
- <version>1.12.4</version>
+ <version>1.13.1</version>
<license>unknown</license>
<source>gst-plugins-ugly</source>
<package>GStreamer Ugly Plug-ins source release</package>
diff --git a/docs/plugins/inspect/plugin-amrwbdec.xml b/docs/plugins/inspect/plugin-amrwbdec.xml
index 4d55421..fb4702e 100644
--- a/docs/plugins/inspect/plugin-amrwbdec.xml
+++ b/docs/plugins/inspect/plugin-amrwbdec.xml
@@ -3,7 +3,7 @@
<description>Adaptive Multi-Rate Wide-Band Decoder</description>
<filename>../../ext/amrwbdec/.libs/libgstamrwbdec.so</filename>
<basename>libgstamrwbdec.so</basename>
- <version>1.12.4</version>
+ <version>1.13.1</version>
<license>unknown</license>
<source>gst-plugins-ugly</source>
<package>GStreamer Ugly Plug-ins source release</package>
diff --git a/docs/plugins/inspect/plugin-asf.xml b/docs/plugins/inspect/plugin-asf.xml
index 7f9059b..553cfa5 100644
--- a/docs/plugins/inspect/plugin-asf.xml
+++ b/docs/plugins/inspect/plugin-asf.xml
@@ -3,7 +3,7 @@
<description>Demuxes and muxes audio and video in Microsofts ASF format</description>
<filename>../../gst/asfdemux/.libs/libgstasf.so</filename>
<basename>libgstasf.so</basename>
- <version>1.12.4</version>
+ <version>1.13.1</version>
<license>LGPL</license>
<source>gst-plugins-ugly</source>
<package>GStreamer Ugly Plug-ins source release</package>
diff --git a/docs/plugins/inspect/plugin-cdio.xml b/docs/plugins/inspect/plugin-cdio.xml
index 0ebc65b..9ed3230 100644
--- a/docs/plugins/inspect/plugin-cdio.xml
+++ b/docs/plugins/inspect/plugin-cdio.xml
@@ -3,7 +3,7 @@
<description>Read audio from audio CDs</description>
<filename>../../ext/cdio/.libs/libgstcdio.so</filename>
<basename>libgstcdio.so</basename>
- <version>1.12.4</version>
+ <version>1.13.1</version>
<license>GPL</license>
<source>gst-plugins-ugly</source>
<package>GStreamer Ugly Plug-ins source release</package>
diff --git a/docs/plugins/inspect/plugin-dvdlpcmdec.xml b/docs/plugins/inspect/plugin-dvdlpcmdec.xml
index 7ec2f1e..b8e11f3 100644
--- a/docs/plugins/inspect/plugin-dvdlpcmdec.xml
+++ b/docs/plugins/inspect/plugin-dvdlpcmdec.xml
@@ -3,7 +3,7 @@
<description>Decode DVD LPCM frames into standard PCM</description>
<filename>../../gst/dvdlpcmdec/.libs/libgstdvdlpcmdec.so</filename>
<basename>libgstdvdlpcmdec.so</basename>
- <version>1.12.4</version>
+ <version>1.13.1</version>
<license>LGPL</license>
<source>gst-plugins-ugly</source>
<package>GStreamer Ugly Plug-ins source release</package>
@@ -20,7 +20,7 @@
<name>sink</name>
<direction>sink</direction>
<presence>always</presence>
- <details>audio/x-private1-lpcm; audio/x-private2-lpcm; audio/x-lpcm, width=(int){ 16, 20, 24 }, rate=(int){ 32000, 44100, 48000, 96000 }, channels=(int)[ 1, 8 ], dynamic_range=(int)[ 0, 255 ], emphasis=(boolean){ true, false }, mute=(boolean){ true, false }</details>
+ <details>audio/x-private1-lpcm; audio/x-private2-lpcm; audio/x-private-ts-lpcm; audio/x-lpcm, width=(int){ 16, 20, 24 }, rate=(int){ 32000, 44100, 48000, 96000 }, channels=(int)[ 1, 8 ], dynamic_range=(int)[ 0, 255 ], emphasis=(boolean){ true, false }, mute=(boolean){ true, false }</details>
</caps>
<caps>
<name>src</name>
diff --git a/docs/plugins/inspect/plugin-dvdread.xml b/docs/plugins/inspect/plugin-dvdread.xml
index b9ad117..cf8071e 100644
--- a/docs/plugins/inspect/plugin-dvdread.xml
+++ b/docs/plugins/inspect/plugin-dvdread.xml
@@ -3,7 +3,7 @@
<description>Access a DVD with dvdread</description>
<filename>../../ext/dvdread/.libs/libgstdvdread.so</filename>
<basename>libgstdvdread.so</basename>
- <version>1.12.4</version>
+ <version>1.13.1</version>
<license>GPL</license>
<source>gst-plugins-ugly</source>
<package>GStreamer Ugly Plug-ins source release</package>
diff --git a/docs/plugins/inspect/plugin-dvdsub.xml b/docs/plugins/inspect/plugin-dvdsub.xml
index 1cba78f..e105cad 100644
--- a/docs/plugins/inspect/plugin-dvdsub.xml
+++ b/docs/plugins/inspect/plugin-dvdsub.xml
@@ -3,7 +3,7 @@
<description>DVD subtitle parser and decoder</description>
<filename>../../gst/dvdsub/.libs/libgstdvdsub.so</filename>
<basename>libgstdvdsub.so</basename>
- <version>1.12.4</version>
+ <version>1.13.1</version>
<license>LGPL</license>
<source>gst-plugins-ugly</source>
<package>GStreamer Ugly Plug-ins source release</package>
diff --git a/docs/plugins/inspect/plugin-lame.xml b/docs/plugins/inspect/plugin-lame.xml
deleted file mode 100644
index 19dd170..0000000
--- a/docs/plugins/inspect/plugin-lame.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<plugin>
- <name>lame</name>
- <description>Encode MP3s with LAME</description>
- <filename>../../ext/lame/.libs/libgstlame.so</filename>
- <basename>libgstlame.so</basename>
- <version>1.12.4</version>
- <license>LGPL</license>
- <source>gst-plugins-ugly</source>
- <package>GStreamer Ugly Plug-ins source release</package>
- <origin>Unknown package origin</origin>
- <elements>
- <element>
- <name>lamemp3enc</name>
- <longname>L.A.M.E. mp3 encoder</longname>
- <class>Codec/Encoder/Audio</class>
- <description>High-quality free MP3 encoder</description>
- <author>Sebastian Dröge <sebastian.droege@collabora.co.uk></author>
- <pads>
- <caps>
- <name>sink</name>
- <direction>sink</direction>
- <presence>always</presence>
- <details>audio/x-raw, format=(string)S16LE, layout=(string)interleaved, rate=(int){ 8000, 11025, 12000, 16000, 22050, 24000, 32000, 44100, 48000 }, channels=(int)1; audio/x-raw, format=(string)S16LE, layout=(string)interleaved, rate=(int){ 8000, 11025, 12000, 16000, 22050, 24000, 32000, 44100, 48000 }, channels=(int)2, channel-mask=(bitmask)0x0000000000000003</details>
- </caps>
- <caps>
- <name>src</name>
- <direction>source</direction>
- <presence>always</presence>
- <details>audio/mpeg, mpegversion=(int)1, layer=(int)3, rate=(int){ 8000, 11025, 12000, 16000, 22050, 24000, 32000, 44100, 48000 }, channels=(int)[ 1, 2 ]</details>
- </caps>
- </pads>
- </element>
- </elements>
-</plugin>
\ No newline at end of file
diff --git a/docs/plugins/inspect/plugin-mpeg2dec.xml b/docs/plugins/inspect/plugin-mpeg2dec.xml
index 69b8c18..eb2ad8a 100644
--- a/docs/plugins/inspect/plugin-mpeg2dec.xml
+++ b/docs/plugins/inspect/plugin-mpeg2dec.xml
@@ -3,7 +3,7 @@
<description>LibMpeg2 decoder</description>
<filename>../../ext/mpeg2dec/.libs/libgstmpeg2dec.so</filename>
<basename>libgstmpeg2dec.so</basename>
- <version>1.12.4</version>
+ <version>1.13.1</version>
<license>GPL</license>
<source>gst-plugins-ugly</source>
<package>GStreamer Ugly Plug-ins source release</package>
diff --git a/docs/plugins/inspect/plugin-mpg123.xml b/docs/plugins/inspect/plugin-mpg123.xml
deleted file mode 100644
index b3605c6..0000000
--- a/docs/plugins/inspect/plugin-mpg123.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<plugin>
- <name>mpg123</name>
- <description>mp3 decoding based on the mpg123 library</description>
- <filename>../../ext/mpg123/.libs/libgstmpg123.so</filename>
- <basename>libgstmpg123.so</basename>
- <version>1.12.4</version>
- <license>LGPL</license>
- <source>gst-plugins-ugly</source>
- <package>GStreamer Ugly Plug-ins source release</package>
- <origin>Unknown package origin</origin>
- <elements>
- <element>
- <name>mpg123audiodec</name>
- <longname>mpg123 mp3 decoder</longname>
- <class>Codec/Decoder/Audio</class>
- <description>Decodes mp3 streams using the mpg123 library</description>
- <author>Carlos Rafael Giani <dv@pseudoterminal.org></author>
- <pads>
- <caps>
- <name>sink</name>
- <direction>sink</direction>
- <presence>always</presence>
- <details>audio/mpeg, mpegversion=(int)1, layer=(int)[ 1, 3 ], rate=(int){ 8000, 11025, 12000, 16000, 22050, 24000, 32000, 44100, 48000 }, channels=(int)[ 1, 2 ], parsed=(boolean)true</details>
- </caps>
- <caps>
- <name>src</name>
- <direction>source</direction>
- <presence>always</presence>
- <details>audio/x-raw, format=(string){ S16LE, U16LE, S32LE, U32LE, S24LE, U24LE, F32LE }, rate=(int){ 8000, 11025, 12000, 16000, 22050, 24000, 32000, 44100, 48000 }, channels=(int)[ 1, 2 ], layout=(string)interleaved</details>
- </caps>
- </pads>
- </element>
- </elements>
-</plugin>
\ No newline at end of file
diff --git a/docs/plugins/inspect/plugin-realmedia.xml b/docs/plugins/inspect/plugin-realmedia.xml
index 41ca18b..d0e7102 100644
--- a/docs/plugins/inspect/plugin-realmedia.xml
+++ b/docs/plugins/inspect/plugin-realmedia.xml
@@ -3,7 +3,7 @@
<description>RealMedia support plugins</description>
<filename>../../gst/realmedia/.libs/libgstrealmedia.so</filename>
<basename>libgstrealmedia.so</basename>
- <version>1.12.4</version>
+ <version>1.13.1</version>
<license>LGPL</license>
<source>gst-plugins-ugly</source>
<package>GStreamer Ugly Plug-ins source release</package>
diff --git a/docs/plugins/inspect/plugin-siddec.xml b/docs/plugins/inspect/plugin-sid.xml
similarity index 95%
rename from docs/plugins/inspect/plugin-siddec.xml
rename to docs/plugins/inspect/plugin-sid.xml
index 0fd9bcd..c78fb46 100644
--- a/docs/plugins/inspect/plugin-siddec.xml
+++ b/docs/plugins/inspect/plugin-sid.xml
@@ -1,9 +1,9 @@
<plugin>
- <name>siddec</name>
+ <name>sid</name>
<description>Uses libsidplay to decode .sid files</description>
<filename>../../ext/sidplay/.libs/libgstsid.so</filename>
<basename>libgstsid.so</basename>
- <version>1.12.4</version>
+ <version>1.13.1</version>
<license>GPL</license>
<source>gst-plugins-ugly</source>
<package>GStreamer Ugly Plug-ins source release</package>
diff --git a/docs/plugins/inspect/plugin-twolame.xml b/docs/plugins/inspect/plugin-twolame.xml
deleted file mode 100644
index f1aae38..0000000
--- a/docs/plugins/inspect/plugin-twolame.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<plugin>
- <name>twolame</name>
- <description>Encode MP2s with TwoLAME</description>
- <filename>../../ext/twolame/.libs/libgsttwolame.so</filename>
- <basename>libgsttwolame.so</basename>
- <version>1.12.4</version>
- <license>LGPL</license>
- <source>gst-plugins-ugly</source>
- <package>GStreamer Ugly Plug-ins source release</package>
- <origin>Unknown package origin</origin>
- <elements>
- <element>
- <name>twolamemp2enc</name>
- <longname>TwoLAME mp2 encoder</longname>
- <class>Codec/Encoder/Audio</class>
- <description>High-quality free MP2 encoder</description>
- <author>Sebastian Dröge <sebastian.droege@collabora.co.uk></author>
- <pads>
- <caps>
- <name>sink</name>
- <direction>sink</direction>
- <presence>always</presence>
- <details>audio/x-raw, format=(string){ F32LE, S16LE }, layout=(string)interleaved, rate=(int){ 16000, 22050, 24000, 32000, 44100, 48000 }, channels=(int)1; audio/x-raw, format=(string){ F32LE, S16LE }, layout=(string)interleaved, rate=(int){ 16000, 22050, 24000, 32000, 44100, 48000 }, channels=(int)2, channel-mask=(bitmask)0x0000000000000003</details>
- </caps>
- <caps>
- <name>src</name>
- <direction>source</direction>
- <presence>always</presence>
- <details>audio/mpeg, mpegversion=(int)1, layer=(int)2, rate=(int){ 16000, 22050, 24000, 32000, 44100, 48000 }, channels=(int)[ 1, 2 ]</details>
- </caps>
- </pads>
- </element>
- </elements>
-</plugin>
\ No newline at end of file
diff --git a/docs/plugins/inspect/plugin-x264.xml b/docs/plugins/inspect/plugin-x264.xml
index 5558f02..e4cf6b3 100644
--- a/docs/plugins/inspect/plugin-x264.xml
+++ b/docs/plugins/inspect/plugin-x264.xml
@@ -3,7 +3,7 @@
<description>libx264-based H264 plugins</description>
<filename>../../ext/x264/.libs/libgstx264.so</filename>
<basename>libgstx264.so</basename>
- <version>1.12.4</version>
+ <version>1.13.1</version>
<license>GPL</license>
<source>gst-plugins-ugly</source>
<package>GStreamer Ugly Plug-ins source release</package>
diff --git a/docs/plugins/inspect/plugin-xingmux.xml b/docs/plugins/inspect/plugin-xingmux.xml
index 0508b9f..a605309 100644
--- a/docs/plugins/inspect/plugin-xingmux.xml
+++ b/docs/plugins/inspect/plugin-xingmux.xml
@@ -3,7 +3,7 @@
<description>Add XING tags to mpeg audio files</description>
<filename>../../gst/xingmux/.libs/libgstxingmux.so</filename>
<basename>libgstxingmux.so</basename>
- <version>1.12.4</version>
+ <version>1.13.1</version>
<license>LGPL</license>
<source>gst-plugins-ugly</source>
<package>GStreamer Ugly Plug-ins source release</package>
diff --git a/ext/Makefile.am b/ext/Makefile.am
index 3f94406..1a89785 100644
--- a/ext/Makefile.am
+++ b/ext/Makefile.am
@@ -28,36 +28,18 @@
DVDREAD_DIR =
endif
-if USE_LAME
-LAME_DIR = lame
-else
-LAME_DIR =
-endif
-
if USE_MPEG2DEC
MPEG2DEC_DIR = mpeg2dec
else
MPEG2DEC_DIR =
endif
-if USE_MPG123
-MPG123_DIR=mpg123
-else
-MPG123_DIR=
-endif
-
if USE_SIDPLAY
SIDPLAY_DIR = sidplay
else
SIDPLAY_DIR =
endif
-if USE_TWOLAME
-TWOLAME_DIR = twolame
-else
-TWOLAME_DIR =
-endif
-
if USE_X264
X264_DIR=x264
else
@@ -70,11 +52,8 @@
$(AMRWB_DIR) \
$(CDIO_DIR) \
$(DVDREAD_DIR) \
- $(LAME_DIR) \
$(MPEG2DEC_DIR) \
- $(MPG123_DIR) \
$(SIDPLAY_DIR) \
- $(TWOLAME_DIR) \
$(X264_DIR)
DIST_SUBDIRS = \
@@ -83,11 +62,8 @@
amrwbdec \
cdio \
dvdread \
- lame \
mpeg2dec \
- mpg123 \
sidplay \
- twolame \
x264
include $(top_srcdir)/common/parallel-subdirs.mak
diff --git a/ext/Makefile.in b/ext/Makefile.in
index ac16dcf..750b08f 100644
--- a/ext/Makefile.in
+++ b/ext/Makefile.in
@@ -263,6 +263,7 @@
ERROR_CFLAGS = @ERROR_CFLAGS@
ERROR_CXXFLAGS = @ERROR_CXXFLAGS@
EXEEXT = @EXEEXT@
+EXTRA_CFLAGS = @EXTRA_CFLAGS@
FFLAGS = @FFLAGS@
FGREP = @FGREP@
GCOV = @GCOV@
@@ -314,7 +315,6 @@
GST_PLUGINS_NONPORTED = @GST_PLUGINS_NONPORTED@
GST_PLUGINS_SELECTED = @GST_PLUGINS_SELECTED@
GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
-GST_PLUGIN_LIBTOOLFLAGS = @GST_PLUGIN_LIBTOOLFLAGS@
GST_PREFIX = @GST_PREFIX@
GST_REVISION = @GST_REVISION@
GST_TOOLS_DIR = @GST_TOOLS_DIR@
@@ -325,7 +325,6 @@
GTKDOC_REBASE = @GTKDOC_REBASE@
HAVE_CXX = @HAVE_CXX@
HAVE_DVDREAD = @HAVE_DVDREAD@
-HAVE_LAME = @HAVE_LAME@
HTML_DIR = @HTML_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
@@ -334,8 +333,6 @@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INTLLIBS = @INTLLIBS@
INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-LAME_CFLAGS = @LAME_CFLAGS@
-LAME_LIBS = @LAME_LIBS@
LD = @LD@
LDFLAGS = @LDFLAGS@
LIBICONV = @LIBICONV@
@@ -357,8 +354,6 @@
MKDIR_P = @MKDIR_P@
MPEG2DEC_CFLAGS = @MPEG2DEC_CFLAGS@
MPEG2DEC_LIBS = @MPEG2DEC_LIBS@
-MPG123_CFLAGS = @MPG123_CFLAGS@
-MPG123_LIBS = @MPG123_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_015 = @MSGFMT_015@
MSGMERGE = @MSGMERGE@
@@ -401,13 +396,13 @@
SIDPLAY_CFLAGS = @SIDPLAY_CFLAGS@
SIDPLAY_LIBS = @SIDPLAY_LIBS@
STRIP = @STRIP@
-TWOLAME_CFLAGS = @TWOLAME_CFLAGS@
-TWOLAME_LIBS = @TWOLAME_LIBS@
USE_NLS = @USE_NLS@
VALGRIND_CFLAGS = @VALGRIND_CFLAGS@
VALGRIND_LIBS = @VALGRIND_LIBS@
VALGRIND_PATH = @VALGRIND_PATH@
VERSION = @VERSION@
+VISIBILITY_CFLAGS = @VISIBILITY_CFLAGS@
+VISIBILITY_CXXFLAGS = @VISIBILITY_CXXFLAGS@
WARNING_CFLAGS = @WARNING_CFLAGS@
WARNING_CXXFLAGS = @WARNING_CXXFLAGS@
WIN32_LIBS = @WIN32_LIBS@
@@ -489,16 +484,10 @@
@USE_CDIO_TRUE@CDIO_DIR = cdio
@USE_DVDREAD_FALSE@DVDREAD_DIR =
@USE_DVDREAD_TRUE@DVDREAD_DIR = dvdread
-@USE_LAME_FALSE@LAME_DIR =
-@USE_LAME_TRUE@LAME_DIR = lame
@USE_MPEG2DEC_FALSE@MPEG2DEC_DIR =
@USE_MPEG2DEC_TRUE@MPEG2DEC_DIR = mpeg2dec
-@USE_MPG123_FALSE@MPG123_DIR =
-@USE_MPG123_TRUE@MPG123_DIR = mpg123
@USE_SIDPLAY_FALSE@SIDPLAY_DIR =
@USE_SIDPLAY_TRUE@SIDPLAY_DIR = sidplay
-@USE_TWOLAME_FALSE@TWOLAME_DIR =
-@USE_TWOLAME_TRUE@TWOLAME_DIR = twolame
@USE_X264_FALSE@X264_DIR =
@USE_X264_TRUE@X264_DIR = x264
SUBDIRS = \
@@ -507,11 +496,8 @@
$(AMRWB_DIR) \
$(CDIO_DIR) \
$(DVDREAD_DIR) \
- $(LAME_DIR) \
$(MPEG2DEC_DIR) \
- $(MPG123_DIR) \
$(SIDPLAY_DIR) \
- $(TWOLAME_DIR) \
$(X264_DIR)
DIST_SUBDIRS = \
@@ -520,11 +506,8 @@
amrwbdec \
cdio \
dvdread \
- lame \
mpeg2dec \
- mpg123 \
sidplay \
- twolame \
x264
all: all-recursive
diff --git a/ext/a52dec/Makefile.am b/ext/a52dec/Makefile.am
index 6a43121..5a64f66 100644
--- a/ext/a52dec/Makefile.am
+++ b/ext/a52dec/Makefile.am
@@ -15,6 +15,5 @@
$(ORC_LIBS) \
$(A52DEC_LIBS)
libgsta52dec_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgsta52dec_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
noinst_HEADERS = gsta52dec.h
diff --git a/ext/a52dec/Makefile.in b/ext/a52dec/Makefile.in
index b6f0caf..616d410 100644
--- a/ext/a52dec/Makefile.in
+++ b/ext/a52dec/Makefile.in
@@ -171,9 +171,9 @@
am__v_lt_0 = --silent
am__v_lt_1 =
libgsta52dec_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
- $(libgsta52dec_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
- $(CCLD) $(libgsta52dec_la_CFLAGS) $(CFLAGS) \
- $(libgsta52dec_la_LDFLAGS) $(LDFLAGS) -o $@
+ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+ $(libgsta52dec_la_CFLAGS) $(CFLAGS) $(libgsta52dec_la_LDFLAGS) \
+ $(LDFLAGS) -o $@
AM_V_P = $(am__v_P_@AM_V@)
am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
am__v_P_0 = false
@@ -285,6 +285,7 @@
ERROR_CFLAGS = @ERROR_CFLAGS@
ERROR_CXXFLAGS = @ERROR_CXXFLAGS@
EXEEXT = @EXEEXT@
+EXTRA_CFLAGS = @EXTRA_CFLAGS@
FFLAGS = @FFLAGS@
FGREP = @FGREP@
GCOV = @GCOV@
@@ -336,7 +337,6 @@
GST_PLUGINS_NONPORTED = @GST_PLUGINS_NONPORTED@
GST_PLUGINS_SELECTED = @GST_PLUGINS_SELECTED@
GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
-GST_PLUGIN_LIBTOOLFLAGS = @GST_PLUGIN_LIBTOOLFLAGS@
GST_PREFIX = @GST_PREFIX@
GST_REVISION = @GST_REVISION@
GST_TOOLS_DIR = @GST_TOOLS_DIR@
@@ -347,7 +347,6 @@
GTKDOC_REBASE = @GTKDOC_REBASE@
HAVE_CXX = @HAVE_CXX@
HAVE_DVDREAD = @HAVE_DVDREAD@
-HAVE_LAME = @HAVE_LAME@
HTML_DIR = @HTML_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
@@ -356,8 +355,6 @@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INTLLIBS = @INTLLIBS@
INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-LAME_CFLAGS = @LAME_CFLAGS@
-LAME_LIBS = @LAME_LIBS@
LD = @LD@
LDFLAGS = @LDFLAGS@
LIBICONV = @LIBICONV@
@@ -379,8 +376,6 @@
MKDIR_P = @MKDIR_P@
MPEG2DEC_CFLAGS = @MPEG2DEC_CFLAGS@
MPEG2DEC_LIBS = @MPEG2DEC_LIBS@
-MPG123_CFLAGS = @MPG123_CFLAGS@
-MPG123_LIBS = @MPG123_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_015 = @MSGFMT_015@
MSGMERGE = @MSGMERGE@
@@ -423,13 +418,13 @@
SIDPLAY_CFLAGS = @SIDPLAY_CFLAGS@
SIDPLAY_LIBS = @SIDPLAY_LIBS@
STRIP = @STRIP@
-TWOLAME_CFLAGS = @TWOLAME_CFLAGS@
-TWOLAME_LIBS = @TWOLAME_LIBS@
USE_NLS = @USE_NLS@
VALGRIND_CFLAGS = @VALGRIND_CFLAGS@
VALGRIND_LIBS = @VALGRIND_LIBS@
VALGRIND_PATH = @VALGRIND_PATH@
VERSION = @VERSION@
+VISIBILITY_CFLAGS = @VISIBILITY_CFLAGS@
+VISIBILITY_CXXFLAGS = @VISIBILITY_CXXFLAGS@
WARNING_CFLAGS = @WARNING_CFLAGS@
WARNING_CXXFLAGS = @WARNING_CXXFLAGS@
WIN32_LIBS = @WIN32_LIBS@
@@ -519,7 +514,6 @@
$(A52DEC_LIBS)
libgsta52dec_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgsta52dec_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
noinst_HEADERS = gsta52dec.h
all: all-am
@@ -626,11 +620,11 @@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
libgsta52dec_la-gsta52dec.lo: gsta52dec.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgsta52dec_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgsta52dec_la_CFLAGS) $(CFLAGS) -MT libgsta52dec_la-gsta52dec.lo -MD -MP -MF $(DEPDIR)/libgsta52dec_la-gsta52dec.Tpo -c -o libgsta52dec_la-gsta52dec.lo `test -f 'gsta52dec.c' || echo '$(srcdir)/'`gsta52dec.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgsta52dec_la_CFLAGS) $(CFLAGS) -MT libgsta52dec_la-gsta52dec.lo -MD -MP -MF $(DEPDIR)/libgsta52dec_la-gsta52dec.Tpo -c -o libgsta52dec_la-gsta52dec.lo `test -f 'gsta52dec.c' || echo '$(srcdir)/'`gsta52dec.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgsta52dec_la-gsta52dec.Tpo $(DEPDIR)/libgsta52dec_la-gsta52dec.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gsta52dec.c' object='libgsta52dec_la-gsta52dec.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgsta52dec_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgsta52dec_la_CFLAGS) $(CFLAGS) -c -o libgsta52dec_la-gsta52dec.lo `test -f 'gsta52dec.c' || echo '$(srcdir)/'`gsta52dec.c
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgsta52dec_la_CFLAGS) $(CFLAGS) -c -o libgsta52dec_la-gsta52dec.lo `test -f 'gsta52dec.c' || echo '$(srcdir)/'`gsta52dec.c
mostlyclean-libtool:
-rm -f *.lo
diff --git a/ext/amrnb/Makefile.am b/ext/amrnb/Makefile.am
index 283f54d..7819b74 100644
--- a/ext/amrnb/Makefile.am
+++ b/ext/amrnb/Makefile.am
@@ -11,7 +11,6 @@
-lgstaudio-@GST_API_VERSION@ \
$(GST_BASE_LIBS) $(GST_LIBS) $(AMRNB_LIBS)
libgstamrnb_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstamrnb_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
noinst_HEADERS = \
amrnbdec.h \
diff --git a/ext/amrnb/Makefile.in b/ext/amrnb/Makefile.in
index 08c7195..d06c6bf 100644
--- a/ext/amrnb/Makefile.in
+++ b/ext/amrnb/Makefile.in
@@ -173,9 +173,9 @@
am__v_lt_0 = --silent
am__v_lt_1 =
libgstamrnb_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
- $(libgstamrnb_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
- $(CCLD) $(libgstamrnb_la_CFLAGS) $(CFLAGS) \
- $(libgstamrnb_la_LDFLAGS) $(LDFLAGS) -o $@
+ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+ $(libgstamrnb_la_CFLAGS) $(CFLAGS) $(libgstamrnb_la_LDFLAGS) \
+ $(LDFLAGS) -o $@
AM_V_P = $(am__v_P_@AM_V@)
am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
am__v_P_0 = false
@@ -288,6 +288,7 @@
ERROR_CFLAGS = @ERROR_CFLAGS@
ERROR_CXXFLAGS = @ERROR_CXXFLAGS@
EXEEXT = @EXEEXT@
+EXTRA_CFLAGS = @EXTRA_CFLAGS@
FFLAGS = @FFLAGS@
FGREP = @FGREP@
GCOV = @GCOV@
@@ -339,7 +340,6 @@
GST_PLUGINS_NONPORTED = @GST_PLUGINS_NONPORTED@
GST_PLUGINS_SELECTED = @GST_PLUGINS_SELECTED@
GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
-GST_PLUGIN_LIBTOOLFLAGS = @GST_PLUGIN_LIBTOOLFLAGS@
GST_PREFIX = @GST_PREFIX@
GST_REVISION = @GST_REVISION@
GST_TOOLS_DIR = @GST_TOOLS_DIR@
@@ -350,7 +350,6 @@
GTKDOC_REBASE = @GTKDOC_REBASE@
HAVE_CXX = @HAVE_CXX@
HAVE_DVDREAD = @HAVE_DVDREAD@
-HAVE_LAME = @HAVE_LAME@
HTML_DIR = @HTML_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
@@ -359,8 +358,6 @@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INTLLIBS = @INTLLIBS@
INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-LAME_CFLAGS = @LAME_CFLAGS@
-LAME_LIBS = @LAME_LIBS@
LD = @LD@
LDFLAGS = @LDFLAGS@
LIBICONV = @LIBICONV@
@@ -382,8 +379,6 @@
MKDIR_P = @MKDIR_P@
MPEG2DEC_CFLAGS = @MPEG2DEC_CFLAGS@
MPEG2DEC_LIBS = @MPEG2DEC_LIBS@
-MPG123_CFLAGS = @MPG123_CFLAGS@
-MPG123_LIBS = @MPG123_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_015 = @MSGFMT_015@
MSGMERGE = @MSGMERGE@
@@ -426,13 +421,13 @@
SIDPLAY_CFLAGS = @SIDPLAY_CFLAGS@
SIDPLAY_LIBS = @SIDPLAY_LIBS@
STRIP = @STRIP@
-TWOLAME_CFLAGS = @TWOLAME_CFLAGS@
-TWOLAME_LIBS = @TWOLAME_LIBS@
USE_NLS = @USE_NLS@
VALGRIND_CFLAGS = @VALGRIND_CFLAGS@
VALGRIND_LIBS = @VALGRIND_LIBS@
VALGRIND_PATH = @VALGRIND_PATH@
VERSION = @VERSION@
+VISIBILITY_CFLAGS = @VISIBILITY_CFLAGS@
+VISIBILITY_CXXFLAGS = @VISIBILITY_CXXFLAGS@
WARNING_CFLAGS = @WARNING_CFLAGS@
WARNING_CXXFLAGS = @WARNING_CXXFLAGS@
WIN32_LIBS = @WIN32_LIBS@
@@ -518,7 +513,6 @@
$(GST_BASE_LIBS) $(GST_LIBS) $(AMRNB_LIBS)
libgstamrnb_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstamrnb_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
noinst_HEADERS = \
amrnbdec.h \
amrnbenc.h
@@ -633,25 +627,25 @@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
libgstamrnb_la-amrnb.lo: amrnb.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstamrnb_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstamrnb_la_CFLAGS) $(CFLAGS) -MT libgstamrnb_la-amrnb.lo -MD -MP -MF $(DEPDIR)/libgstamrnb_la-amrnb.Tpo -c -o libgstamrnb_la-amrnb.lo `test -f 'amrnb.c' || echo '$(srcdir)/'`amrnb.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstamrnb_la_CFLAGS) $(CFLAGS) -MT libgstamrnb_la-amrnb.lo -MD -MP -MF $(DEPDIR)/libgstamrnb_la-amrnb.Tpo -c -o libgstamrnb_la-amrnb.lo `test -f 'amrnb.c' || echo '$(srcdir)/'`amrnb.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstamrnb_la-amrnb.Tpo $(DEPDIR)/libgstamrnb_la-amrnb.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='amrnb.c' object='libgstamrnb_la-amrnb.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstamrnb_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstamrnb_la_CFLAGS) $(CFLAGS) -c -o libgstamrnb_la-amrnb.lo `test -f 'amrnb.c' || echo '$(srcdir)/'`amrnb.c
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstamrnb_la_CFLAGS) $(CFLAGS) -c -o libgstamrnb_la-amrnb.lo `test -f 'amrnb.c' || echo '$(srcdir)/'`amrnb.c
libgstamrnb_la-amrnbdec.lo: amrnbdec.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstamrnb_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstamrnb_la_CFLAGS) $(CFLAGS) -MT libgstamrnb_la-amrnbdec.lo -MD -MP -MF $(DEPDIR)/libgstamrnb_la-amrnbdec.Tpo -c -o libgstamrnb_la-amrnbdec.lo `test -f 'amrnbdec.c' || echo '$(srcdir)/'`amrnbdec.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstamrnb_la_CFLAGS) $(CFLAGS) -MT libgstamrnb_la-amrnbdec.lo -MD -MP -MF $(DEPDIR)/libgstamrnb_la-amrnbdec.Tpo -c -o libgstamrnb_la-amrnbdec.lo `test -f 'amrnbdec.c' || echo '$(srcdir)/'`amrnbdec.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstamrnb_la-amrnbdec.Tpo $(DEPDIR)/libgstamrnb_la-amrnbdec.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='amrnbdec.c' object='libgstamrnb_la-amrnbdec.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstamrnb_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstamrnb_la_CFLAGS) $(CFLAGS) -c -o libgstamrnb_la-amrnbdec.lo `test -f 'amrnbdec.c' || echo '$(srcdir)/'`amrnbdec.c
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstamrnb_la_CFLAGS) $(CFLAGS) -c -o libgstamrnb_la-amrnbdec.lo `test -f 'amrnbdec.c' || echo '$(srcdir)/'`amrnbdec.c
libgstamrnb_la-amrnbenc.lo: amrnbenc.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstamrnb_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstamrnb_la_CFLAGS) $(CFLAGS) -MT libgstamrnb_la-amrnbenc.lo -MD -MP -MF $(DEPDIR)/libgstamrnb_la-amrnbenc.Tpo -c -o libgstamrnb_la-amrnbenc.lo `test -f 'amrnbenc.c' || echo '$(srcdir)/'`amrnbenc.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstamrnb_la_CFLAGS) $(CFLAGS) -MT libgstamrnb_la-amrnbenc.lo -MD -MP -MF $(DEPDIR)/libgstamrnb_la-amrnbenc.Tpo -c -o libgstamrnb_la-amrnbenc.lo `test -f 'amrnbenc.c' || echo '$(srcdir)/'`amrnbenc.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstamrnb_la-amrnbenc.Tpo $(DEPDIR)/libgstamrnb_la-amrnbenc.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='amrnbenc.c' object='libgstamrnb_la-amrnbenc.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstamrnb_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstamrnb_la_CFLAGS) $(CFLAGS) -c -o libgstamrnb_la-amrnbenc.lo `test -f 'amrnbenc.c' || echo '$(srcdir)/'`amrnbenc.c
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstamrnb_la_CFLAGS) $(CFLAGS) -c -o libgstamrnb_la-amrnbenc.lo `test -f 'amrnbenc.c' || echo '$(srcdir)/'`amrnbenc.c
mostlyclean-libtool:
-rm -f *.lo
diff --git a/ext/amrnb/amrnbdec.c b/ext/amrnb/amrnbdec.c
index 653f1c5..8f2c422 100644
--- a/ext/amrnb/amrnbdec.c
+++ b/ext/amrnb/amrnbdec.c
@@ -241,14 +241,12 @@
gint block, mode;
size = gst_adapter_available (adapter);
- g_return_val_if_fail (size > 0, GST_FLOW_ERROR);
+ if (size < 1)
+ return GST_FLOW_ERROR;
gst_audio_decoder_get_parse_state (dec, &sync, &eos);
/* need to peek data to get the size */
- if (size < 1)
- return GST_FLOW_ERROR;
-
gst_adapter_copy (adapter, head, 0, 1);
/* get size */
diff --git a/ext/amrwbdec/Makefile.am b/ext/amrwbdec/Makefile.am
index aef2984..8fa3acf 100644
--- a/ext/amrwbdec/Makefile.am
+++ b/ext/amrwbdec/Makefile.am
@@ -11,7 +11,6 @@
-lgstaudio-@GST_API_VERSION@ \
$(GST_LIBS) $(AMRWB_LIBS)
libgstamrwbdec_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstamrwbdec_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
noinst_HEADERS = \
amrwbdec.h
diff --git a/ext/amrwbdec/Makefile.in b/ext/amrwbdec/Makefile.in
index 88bb25e..b415757 100644
--- a/ext/amrwbdec/Makefile.in
+++ b/ext/amrwbdec/Makefile.in
@@ -172,8 +172,8 @@
am__v_lt_0 = --silent
am__v_lt_1 =
libgstamrwbdec_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
- $(libgstamrwbdec_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
- $(CCLD) $(libgstamrwbdec_la_CFLAGS) $(CFLAGS) \
+ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+ $(libgstamrwbdec_la_CFLAGS) $(CFLAGS) \
$(libgstamrwbdec_la_LDFLAGS) $(LDFLAGS) -o $@
AM_V_P = $(am__v_P_@AM_V@)
am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
@@ -286,6 +286,7 @@
ERROR_CFLAGS = @ERROR_CFLAGS@
ERROR_CXXFLAGS = @ERROR_CXXFLAGS@
EXEEXT = @EXEEXT@
+EXTRA_CFLAGS = @EXTRA_CFLAGS@
FFLAGS = @FFLAGS@
FGREP = @FGREP@
GCOV = @GCOV@
@@ -337,7 +338,6 @@
GST_PLUGINS_NONPORTED = @GST_PLUGINS_NONPORTED@
GST_PLUGINS_SELECTED = @GST_PLUGINS_SELECTED@
GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
-GST_PLUGIN_LIBTOOLFLAGS = @GST_PLUGIN_LIBTOOLFLAGS@
GST_PREFIX = @GST_PREFIX@
GST_REVISION = @GST_REVISION@
GST_TOOLS_DIR = @GST_TOOLS_DIR@
@@ -348,7 +348,6 @@
GTKDOC_REBASE = @GTKDOC_REBASE@
HAVE_CXX = @HAVE_CXX@
HAVE_DVDREAD = @HAVE_DVDREAD@
-HAVE_LAME = @HAVE_LAME@
HTML_DIR = @HTML_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
@@ -357,8 +356,6 @@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INTLLIBS = @INTLLIBS@
INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-LAME_CFLAGS = @LAME_CFLAGS@
-LAME_LIBS = @LAME_LIBS@
LD = @LD@
LDFLAGS = @LDFLAGS@
LIBICONV = @LIBICONV@
@@ -380,8 +377,6 @@
MKDIR_P = @MKDIR_P@
MPEG2DEC_CFLAGS = @MPEG2DEC_CFLAGS@
MPEG2DEC_LIBS = @MPEG2DEC_LIBS@
-MPG123_CFLAGS = @MPG123_CFLAGS@
-MPG123_LIBS = @MPG123_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_015 = @MSGFMT_015@
MSGMERGE = @MSGMERGE@
@@ -424,13 +419,13 @@
SIDPLAY_CFLAGS = @SIDPLAY_CFLAGS@
SIDPLAY_LIBS = @SIDPLAY_LIBS@
STRIP = @STRIP@
-TWOLAME_CFLAGS = @TWOLAME_CFLAGS@
-TWOLAME_LIBS = @TWOLAME_LIBS@
USE_NLS = @USE_NLS@
VALGRIND_CFLAGS = @VALGRIND_CFLAGS@
VALGRIND_LIBS = @VALGRIND_LIBS@
VALGRIND_PATH = @VALGRIND_PATH@
VERSION = @VERSION@
+VISIBILITY_CFLAGS = @VISIBILITY_CFLAGS@
+VISIBILITY_CXXFLAGS = @VISIBILITY_CXXFLAGS@
WARNING_CFLAGS = @WARNING_CFLAGS@
WARNING_CXXFLAGS = @WARNING_CXXFLAGS@
WIN32_LIBS = @WIN32_LIBS@
@@ -516,7 +511,6 @@
$(GST_LIBS) $(AMRWB_LIBS)
libgstamrwbdec_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstamrwbdec_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
noinst_HEADERS = \
amrwbdec.h
@@ -626,18 +620,18 @@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
libgstamrwbdec_la-amrwb.lo: amrwb.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstamrwbdec_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstamrwbdec_la_CFLAGS) $(CFLAGS) -MT libgstamrwbdec_la-amrwb.lo -MD -MP -MF $(DEPDIR)/libgstamrwbdec_la-amrwb.Tpo -c -o libgstamrwbdec_la-amrwb.lo `test -f 'amrwb.c' || echo '$(srcdir)/'`amrwb.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstamrwbdec_la_CFLAGS) $(CFLAGS) -MT libgstamrwbdec_la-amrwb.lo -MD -MP -MF $(DEPDIR)/libgstamrwbdec_la-amrwb.Tpo -c -o libgstamrwbdec_la-amrwb.lo `test -f 'amrwb.c' || echo '$(srcdir)/'`amrwb.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstamrwbdec_la-amrwb.Tpo $(DEPDIR)/libgstamrwbdec_la-amrwb.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='amrwb.c' object='libgstamrwbdec_la-amrwb.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstamrwbdec_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstamrwbdec_la_CFLAGS) $(CFLAGS) -c -o libgstamrwbdec_la-amrwb.lo `test -f 'amrwb.c' || echo '$(srcdir)/'`amrwb.c
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstamrwbdec_la_CFLAGS) $(CFLAGS) -c -o libgstamrwbdec_la-amrwb.lo `test -f 'amrwb.c' || echo '$(srcdir)/'`amrwb.c
libgstamrwbdec_la-amrwbdec.lo: amrwbdec.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstamrwbdec_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstamrwbdec_la_CFLAGS) $(CFLAGS) -MT libgstamrwbdec_la-amrwbdec.lo -MD -MP -MF $(DEPDIR)/libgstamrwbdec_la-amrwbdec.Tpo -c -o libgstamrwbdec_la-amrwbdec.lo `test -f 'amrwbdec.c' || echo '$(srcdir)/'`amrwbdec.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstamrwbdec_la_CFLAGS) $(CFLAGS) -MT libgstamrwbdec_la-amrwbdec.lo -MD -MP -MF $(DEPDIR)/libgstamrwbdec_la-amrwbdec.Tpo -c -o libgstamrwbdec_la-amrwbdec.lo `test -f 'amrwbdec.c' || echo '$(srcdir)/'`amrwbdec.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstamrwbdec_la-amrwbdec.Tpo $(DEPDIR)/libgstamrwbdec_la-amrwbdec.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='amrwbdec.c' object='libgstamrwbdec_la-amrwbdec.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstamrwbdec_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstamrwbdec_la_CFLAGS) $(CFLAGS) -c -o libgstamrwbdec_la-amrwbdec.lo `test -f 'amrwbdec.c' || echo '$(srcdir)/'`amrwbdec.c
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstamrwbdec_la_CFLAGS) $(CFLAGS) -c -o libgstamrwbdec_la-amrwbdec.lo `test -f 'amrwbdec.c' || echo '$(srcdir)/'`amrwbdec.c
mostlyclean-libtool:
-rm -f *.lo
diff --git a/ext/amrwbdec/amrwbdec.c b/ext/amrwbdec/amrwbdec.c
index f90b7b7..cf05d95 100644
--- a/ext/amrwbdec/amrwbdec.c
+++ b/ext/amrwbdec/amrwbdec.c
@@ -172,14 +172,12 @@
gint block, mode;
size = gst_adapter_available (adapter);
- g_return_val_if_fail (size > 0, GST_FLOW_ERROR);
+ if (size < 1)
+ return GST_FLOW_ERROR;
gst_audio_decoder_get_parse_state (dec, &sync, &eos);
/* need to peek data to get the size */
- if (size < 1)
- return GST_FLOW_ERROR;
-
gst_adapter_copy (adapter, header, 0, 1);
mode = (header[0] >> 3) & 0x0F;
block = block_size[mode];
diff --git a/ext/cdio/Makefile.am b/ext/cdio/Makefile.am
index bd8f422..34f707e 100644
--- a/ext/cdio/Makefile.am
+++ b/ext/cdio/Makefile.am
@@ -16,7 +16,6 @@
$(CDIO_LIBS)
libgstcdio_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstcdio_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
noinst_HEADERS = \
gstcdio.h \
diff --git a/ext/cdio/Makefile.in b/ext/cdio/Makefile.in
index 4d7dde7..1b4db1c 100644
--- a/ext/cdio/Makefile.in
+++ b/ext/cdio/Makefile.in
@@ -170,10 +170,9 @@
am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
am__v_lt_0 = --silent
am__v_lt_1 =
-libgstcdio_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
- $(libgstcdio_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
- $(CCLD) $(libgstcdio_la_CFLAGS) $(CFLAGS) \
- $(libgstcdio_la_LDFLAGS) $(LDFLAGS) -o $@
+libgstcdio_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(libgstcdio_la_CFLAGS) \
+ $(CFLAGS) $(libgstcdio_la_LDFLAGS) $(LDFLAGS) -o $@
AM_V_P = $(am__v_P_@AM_V@)
am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
am__v_P_0 = false
@@ -285,6 +284,7 @@
ERROR_CFLAGS = @ERROR_CFLAGS@
ERROR_CXXFLAGS = @ERROR_CXXFLAGS@
EXEEXT = @EXEEXT@
+EXTRA_CFLAGS = @EXTRA_CFLAGS@
FFLAGS = @FFLAGS@
FGREP = @FGREP@
GCOV = @GCOV@
@@ -336,7 +336,6 @@
GST_PLUGINS_NONPORTED = @GST_PLUGINS_NONPORTED@
GST_PLUGINS_SELECTED = @GST_PLUGINS_SELECTED@
GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
-GST_PLUGIN_LIBTOOLFLAGS = @GST_PLUGIN_LIBTOOLFLAGS@
GST_PREFIX = @GST_PREFIX@
GST_REVISION = @GST_REVISION@
GST_TOOLS_DIR = @GST_TOOLS_DIR@
@@ -347,7 +346,6 @@
GTKDOC_REBASE = @GTKDOC_REBASE@
HAVE_CXX = @HAVE_CXX@
HAVE_DVDREAD = @HAVE_DVDREAD@
-HAVE_LAME = @HAVE_LAME@
HTML_DIR = @HTML_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
@@ -356,8 +354,6 @@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INTLLIBS = @INTLLIBS@
INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-LAME_CFLAGS = @LAME_CFLAGS@
-LAME_LIBS = @LAME_LIBS@
LD = @LD@
LDFLAGS = @LDFLAGS@
LIBICONV = @LIBICONV@
@@ -379,8 +375,6 @@
MKDIR_P = @MKDIR_P@
MPEG2DEC_CFLAGS = @MPEG2DEC_CFLAGS@
MPEG2DEC_LIBS = @MPEG2DEC_LIBS@
-MPG123_CFLAGS = @MPG123_CFLAGS@
-MPG123_LIBS = @MPG123_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_015 = @MSGFMT_015@
MSGMERGE = @MSGMERGE@
@@ -423,13 +417,13 @@
SIDPLAY_CFLAGS = @SIDPLAY_CFLAGS@
SIDPLAY_LIBS = @SIDPLAY_LIBS@
STRIP = @STRIP@
-TWOLAME_CFLAGS = @TWOLAME_CFLAGS@
-TWOLAME_LIBS = @TWOLAME_LIBS@
USE_NLS = @USE_NLS@
VALGRIND_CFLAGS = @VALGRIND_CFLAGS@
VALGRIND_LIBS = @VALGRIND_LIBS@
VALGRIND_PATH = @VALGRIND_PATH@
VERSION = @VERSION@
+VISIBILITY_CFLAGS = @VISIBILITY_CFLAGS@
+VISIBILITY_CXXFLAGS = @VISIBILITY_CXXFLAGS@
WARNING_CFLAGS = @WARNING_CFLAGS@
WARNING_CXXFLAGS = @WARNING_CXXFLAGS@
WIN32_LIBS = @WIN32_LIBS@
@@ -518,7 +512,6 @@
$(CDIO_LIBS)
libgstcdio_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstcdio_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
noinst_HEADERS = \
gstcdio.h \
gstcdiocddasrc.h
@@ -629,18 +622,18 @@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
libgstcdio_la-gstcdio.lo: gstcdio.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstcdio_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstcdio_la_CFLAGS) $(CFLAGS) -MT libgstcdio_la-gstcdio.lo -MD -MP -MF $(DEPDIR)/libgstcdio_la-gstcdio.Tpo -c -o libgstcdio_la-gstcdio.lo `test -f 'gstcdio.c' || echo '$(srcdir)/'`gstcdio.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstcdio_la_CFLAGS) $(CFLAGS) -MT libgstcdio_la-gstcdio.lo -MD -MP -MF $(DEPDIR)/libgstcdio_la-gstcdio.Tpo -c -o libgstcdio_la-gstcdio.lo `test -f 'gstcdio.c' || echo '$(srcdir)/'`gstcdio.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstcdio_la-gstcdio.Tpo $(DEPDIR)/libgstcdio_la-gstcdio.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gstcdio.c' object='libgstcdio_la-gstcdio.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstcdio_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstcdio_la_CFLAGS) $(CFLAGS) -c -o libgstcdio_la-gstcdio.lo `test -f 'gstcdio.c' || echo '$(srcdir)/'`gstcdio.c
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstcdio_la_CFLAGS) $(CFLAGS) -c -o libgstcdio_la-gstcdio.lo `test -f 'gstcdio.c' || echo '$(srcdir)/'`gstcdio.c
libgstcdio_la-gstcdiocddasrc.lo: gstcdiocddasrc.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstcdio_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstcdio_la_CFLAGS) $(CFLAGS) -MT libgstcdio_la-gstcdiocddasrc.lo -MD -MP -MF $(DEPDIR)/libgstcdio_la-gstcdiocddasrc.Tpo -c -o libgstcdio_la-gstcdiocddasrc.lo `test -f 'gstcdiocddasrc.c' || echo '$(srcdir)/'`gstcdiocddasrc.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstcdio_la_CFLAGS) $(CFLAGS) -MT libgstcdio_la-gstcdiocddasrc.lo -MD -MP -MF $(DEPDIR)/libgstcdio_la-gstcdiocddasrc.Tpo -c -o libgstcdio_la-gstcdiocddasrc.lo `test -f 'gstcdiocddasrc.c' || echo '$(srcdir)/'`gstcdiocddasrc.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstcdio_la-gstcdiocddasrc.Tpo $(DEPDIR)/libgstcdio_la-gstcdiocddasrc.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gstcdiocddasrc.c' object='libgstcdio_la-gstcdiocddasrc.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstcdio_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstcdio_la_CFLAGS) $(CFLAGS) -c -o libgstcdio_la-gstcdiocddasrc.lo `test -f 'gstcdiocddasrc.c' || echo '$(srcdir)/'`gstcdiocddasrc.c
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstcdio_la_CFLAGS) $(CFLAGS) -c -o libgstcdio_la-gstcdiocddasrc.lo `test -f 'gstcdiocddasrc.c' || echo '$(srcdir)/'`gstcdiocddasrc.c
mostlyclean-libtool:
-rm -f *.lo
diff --git a/ext/dvdread/Makefile.am b/ext/dvdread/Makefile.am
index 30b4ba3..e7ea258 100644
--- a/ext/dvdread/Makefile.am
+++ b/ext/dvdread/Makefile.am
@@ -5,7 +5,6 @@
libgstdvdread_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS) \
$(GMODULE_NO_EXPORT_LIBS) $(DVDREAD_LIBS)
libgstdvdread_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstdvdread_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
noinst_HEADERS = dvdreadsrc.h
diff --git a/ext/dvdread/Makefile.in b/ext/dvdread/Makefile.in
index 25d585e..12851f7 100644
--- a/ext/dvdread/Makefile.in
+++ b/ext/dvdread/Makefile.in
@@ -171,8 +171,8 @@
am__v_lt_0 = --silent
am__v_lt_1 =
libgstdvdread_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
- $(libgstdvdread_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
- $(CCLD) $(libgstdvdread_la_CFLAGS) $(CFLAGS) \
+ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+ $(libgstdvdread_la_CFLAGS) $(CFLAGS) \
$(libgstdvdread_la_LDFLAGS) $(LDFLAGS) -o $@
AM_V_P = $(am__v_P_@AM_V@)
am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
@@ -285,6 +285,7 @@
ERROR_CFLAGS = @ERROR_CFLAGS@
ERROR_CXXFLAGS = @ERROR_CXXFLAGS@
EXEEXT = @EXEEXT@
+EXTRA_CFLAGS = @EXTRA_CFLAGS@
FFLAGS = @FFLAGS@
FGREP = @FGREP@
GCOV = @GCOV@
@@ -336,7 +337,6 @@
GST_PLUGINS_NONPORTED = @GST_PLUGINS_NONPORTED@
GST_PLUGINS_SELECTED = @GST_PLUGINS_SELECTED@
GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
-GST_PLUGIN_LIBTOOLFLAGS = @GST_PLUGIN_LIBTOOLFLAGS@
GST_PREFIX = @GST_PREFIX@
GST_REVISION = @GST_REVISION@
GST_TOOLS_DIR = @GST_TOOLS_DIR@
@@ -347,7 +347,6 @@
GTKDOC_REBASE = @GTKDOC_REBASE@
HAVE_CXX = @HAVE_CXX@
HAVE_DVDREAD = @HAVE_DVDREAD@
-HAVE_LAME = @HAVE_LAME@
HTML_DIR = @HTML_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
@@ -356,8 +355,6 @@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INTLLIBS = @INTLLIBS@
INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-LAME_CFLAGS = @LAME_CFLAGS@
-LAME_LIBS = @LAME_LIBS@
LD = @LD@
LDFLAGS = @LDFLAGS@
LIBICONV = @LIBICONV@
@@ -379,8 +376,6 @@
MKDIR_P = @MKDIR_P@
MPEG2DEC_CFLAGS = @MPEG2DEC_CFLAGS@
MPEG2DEC_LIBS = @MPEG2DEC_LIBS@
-MPG123_CFLAGS = @MPG123_CFLAGS@
-MPG123_LIBS = @MPG123_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_015 = @MSGFMT_015@
MSGMERGE = @MSGMERGE@
@@ -423,13 +418,13 @@
SIDPLAY_CFLAGS = @SIDPLAY_CFLAGS@
SIDPLAY_LIBS = @SIDPLAY_LIBS@
STRIP = @STRIP@
-TWOLAME_CFLAGS = @TWOLAME_CFLAGS@
-TWOLAME_LIBS = @TWOLAME_LIBS@
USE_NLS = @USE_NLS@
VALGRIND_CFLAGS = @VALGRIND_CFLAGS@
VALGRIND_LIBS = @VALGRIND_LIBS@
VALGRIND_PATH = @VALGRIND_PATH@
VERSION = @VERSION@
+VISIBILITY_CFLAGS = @VISIBILITY_CFLAGS@
+VISIBILITY_CXXFLAGS = @VISIBILITY_CXXFLAGS@
WARNING_CFLAGS = @WARNING_CFLAGS@
WARNING_CXXFLAGS = @WARNING_CXXFLAGS@
WIN32_LIBS = @WIN32_LIBS@
@@ -508,7 +503,6 @@
$(GMODULE_NO_EXPORT_LIBS) $(DVDREAD_LIBS)
libgstdvdread_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstdvdread_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
noinst_HEADERS = dvdreadsrc.h
EXTRA_DIST = README demo-play
all: all-am
@@ -616,11 +610,11 @@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
libgstdvdread_la-dvdreadsrc.lo: dvdreadsrc.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstdvdread_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstdvdread_la_CFLAGS) $(CFLAGS) -MT libgstdvdread_la-dvdreadsrc.lo -MD -MP -MF $(DEPDIR)/libgstdvdread_la-dvdreadsrc.Tpo -c -o libgstdvdread_la-dvdreadsrc.lo `test -f 'dvdreadsrc.c' || echo '$(srcdir)/'`dvdreadsrc.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstdvdread_la_CFLAGS) $(CFLAGS) -MT libgstdvdread_la-dvdreadsrc.lo -MD -MP -MF $(DEPDIR)/libgstdvdread_la-dvdreadsrc.Tpo -c -o libgstdvdread_la-dvdreadsrc.lo `test -f 'dvdreadsrc.c' || echo '$(srcdir)/'`dvdreadsrc.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstdvdread_la-dvdreadsrc.Tpo $(DEPDIR)/libgstdvdread_la-dvdreadsrc.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='dvdreadsrc.c' object='libgstdvdread_la-dvdreadsrc.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstdvdread_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstdvdread_la_CFLAGS) $(CFLAGS) -c -o libgstdvdread_la-dvdreadsrc.lo `test -f 'dvdreadsrc.c' || echo '$(srcdir)/'`dvdreadsrc.c
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstdvdread_la_CFLAGS) $(CFLAGS) -c -o libgstdvdread_la-dvdreadsrc.lo `test -f 'dvdreadsrc.c' || echo '$(srcdir)/'`dvdreadsrc.c
mostlyclean-libtool:
-rm -f *.lo
diff --git a/ext/lame/Makefile.am b/ext/lame/Makefile.am
deleted file mode 100644
index c7124dd..0000000
--- a/ext/lame/Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
-plugin_LTLIBRARIES = libgstlame.la
-
-libgstlame_la_SOURCES = gstlamemp3enc.c plugin.c
-libgstlame_la_CFLAGS = \
- $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(LAME_CFLAGS)
-libgstlame_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) -lgstaudio-$(GST_API_VERSION) \
- $(GST_BASE_LIBS) $(GST_LIBS) $(LAME_LIBS)
-libgstlame_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstlame_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
-
-noinst_HEADERS = gstlamemp3enc.h
diff --git a/ext/lame/Makefile.in b/ext/lame/Makefile.in
deleted file mode 100644
index 315dd34..0000000
--- a/ext/lame/Makefile.in
+++ /dev/null
@@ -1,853 +0,0 @@
-# Makefile.in generated by automake 1.15.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994-2017 Free Software Foundation, Inc.
-
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-
-VPATH = @srcdir@
-am__is_gnu_make = { \
- if test -z '$(MAKELEVEL)'; then \
- false; \
- elif test -n '$(MAKE_HOST)'; then \
- true; \
- elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
- true; \
- else \
- false; \
- fi; \
-}
-am__make_running_with_option = \
- case $${target_option-} in \
- ?) ;; \
- *) echo "am__make_running_with_option: internal error: invalid" \
- "target option '$${target_option-}' specified" >&2; \
- exit 1;; \
- esac; \
- has_opt=no; \
- sane_makeflags=$$MAKEFLAGS; \
- if $(am__is_gnu_make); then \
- sane_makeflags=$$MFLAGS; \
- else \
- case $$MAKEFLAGS in \
- *\\[\ \ ]*) \
- bs=\\; \
- sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
- | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
- esac; \
- fi; \
- skip_next=no; \
- strip_trailopt () \
- { \
- flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
- }; \
- for flg in $$sane_makeflags; do \
- test $$skip_next = yes && { skip_next=no; continue; }; \
- case $$flg in \
- *=*|--*) continue;; \
- -*I) strip_trailopt 'I'; skip_next=yes;; \
- -*I?*) strip_trailopt 'I';; \
- -*O) strip_trailopt 'O'; skip_next=yes;; \
- -*O?*) strip_trailopt 'O';; \
- -*l) strip_trailopt 'l'; skip_next=yes;; \
- -*l?*) strip_trailopt 'l';; \
- -[dEDm]) skip_next=yes;; \
- -[JT]) skip_next=yes;; \
- esac; \
- case $$flg in \
- *$$target_option*) has_opt=yes; break;; \
- esac; \
- done; \
- test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-target_triplet = @target@
-subdir = ext/lame
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \
- $(top_srcdir)/common/m4/as-auto-alt.m4 \
- $(top_srcdir)/common/m4/as-compiler-flag.m4 \
- $(top_srcdir)/common/m4/as-libtool.m4 \
- $(top_srcdir)/common/m4/as-version.m4 \
- $(top_srcdir)/common/m4/ax_create_stdint_h.m4 \
- $(top_srcdir)/common/m4/gst-arch.m4 \
- $(top_srcdir)/common/m4/gst-args.m4 \
- $(top_srcdir)/common/m4/gst-check.m4 \
- $(top_srcdir)/common/m4/gst-default.m4 \
- $(top_srcdir)/common/m4/gst-dowhile.m4 \
- $(top_srcdir)/common/m4/gst-error.m4 \
- $(top_srcdir)/common/m4/gst-feature.m4 \
- $(top_srcdir)/common/m4/gst-function.m4 \
- $(top_srcdir)/common/m4/gst-gettext.m4 \
- $(top_srcdir)/common/m4/gst-glib2.m4 \
- $(top_srcdir)/common/m4/gst-package-release-datetime.m4 \
- $(top_srcdir)/common/m4/gst-plugin-docs.m4 \
- $(top_srcdir)/common/m4/gst-plugindir.m4 \
- $(top_srcdir)/common/m4/gst.m4 \
- $(top_srcdir)/common/m4/gtk-doc.m4 \
- $(top_srcdir)/common/m4/orc.m4 $(top_srcdir)/common/m4/pkg.m4 \
- $(top_srcdir)/m4/a52.m4 $(top_srcdir)/m4/gettext.m4 \
- $(top_srcdir)/m4/gst-sid.m4 $(top_srcdir)/m4/iconv.m4 \
- $(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/lib-ld.m4 \
- $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
- $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
- $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
- $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
- $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
- $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-DIST_COMMON = $(srcdir)/Makefile.am $(noinst_HEADERS) \
- $(am__DIST_COMMON)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
- *) f=$$p;; \
- esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
- srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
- for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
- for p in $$list; do echo "$$p $$p"; done | \
- sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
- $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
- if (++n[$$2] == $(am__install_max)) \
- { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
- END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
- sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
- sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
- test -z "$$files" \
- || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
- || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
- $(am__cd) "$$dir" && rm -f $$files; }; \
- }
-am__installdirs = "$(DESTDIR)$(plugindir)"
-LTLIBRARIES = $(plugin_LTLIBRARIES)
-am__DEPENDENCIES_1 =
-libgstlame_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
-am_libgstlame_la_OBJECTS = libgstlame_la-gstlamemp3enc.lo \
- libgstlame_la-plugin.lo
-libgstlame_la_OBJECTS = $(am_libgstlame_la_OBJECTS)
-AM_V_lt = $(am__v_lt_@AM_V@)
-am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
-am__v_lt_0 = --silent
-am__v_lt_1 =
-libgstlame_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
- $(libgstlame_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
- $(CCLD) $(libgstlame_la_CFLAGS) $(CFLAGS) \
- $(libgstlame_la_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo " GEN " $@;
-am__v_GEN_1 =
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-am__v_at_1 =
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CFLAGS) $(CFLAGS)
-AM_V_CC = $(am__v_CC_@AM_V@)
-am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
-am__v_CC_0 = @echo " CC " $@;
-am__v_CC_1 =
-CCLD = $(CC)
-LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CCLD = $(am__v_CCLD_@AM_V@)
-am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
-am__v_CCLD_0 = @echo " CCLD " $@;
-am__v_CCLD_1 =
-SOURCES = $(libgstlame_la_SOURCES)
-DIST_SOURCES = $(libgstlame_la_SOURCES)
-am__can_run_installinfo = \
- case $$AM_UPDATE_INFO_DIR in \
- n|no|NO) false;; \
- *) (install-info --version) >/dev/null 2>&1;; \
- esac
-HEADERS = $(noinst_HEADERS)
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-# Read a list of newline-separated strings from the standard input,
-# and print each of them once, without duplicates. Input order is
-# *not* preserved.
-am__uniquify_input = $(AWK) '\
- BEGIN { nonempty = 0; } \
- { items[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in items) print i; }; } \
-'
-# Make sure the list of sources is unique. This is necessary because,
-# e.g., the same source file might be shared among _SOURCES variables
-# for different programs/libraries.
-am__define_uniq_tagged_files = \
- list='$(am__tagged_files)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | $(am__uniquify_input)`
-ETAGS = etags
-CTAGS = ctags
-am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-A52DEC_CFLAGS = @A52DEC_CFLAGS@
-A52DEC_LIBS = @A52DEC_LIBS@
-ACLOCAL = @ACLOCAL@
-ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
-AMRNB_CFLAGS = @AMRNB_CFLAGS@
-AMRNB_LIBS = @AMRNB_LIBS@
-AMRWB_CFLAGS = @AMRWB_CFLAGS@
-AMRWB_LIBS = @AMRWB_LIBS@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AR = @AR@
-AS = @AS@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCASFLAGS = @CCASFLAGS@
-CCDEPMODE = @CCDEPMODE@
-CDIO_CFLAGS = @CDIO_CFLAGS@
-CDIO_LIBS = @CDIO_LIBS@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFAULT_AUDIOSINK = @DEFAULT_AUDIOSINK@
-DEFAULT_AUDIOSRC = @DEFAULT_AUDIOSRC@
-DEFAULT_VIDEOSINK = @DEFAULT_VIDEOSINK@
-DEFAULT_VIDEOSRC = @DEFAULT_VIDEOSRC@
-DEFAULT_VISUALIZER = @DEFAULT_VISUALIZER@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DEPRECATED_CFLAGS = @DEPRECATED_CFLAGS@
-DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-DVDREAD_LIBS = @DVDREAD_LIBS@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-ERROR_CFLAGS = @ERROR_CFLAGS@
-ERROR_CXXFLAGS = @ERROR_CXXFLAGS@
-EXEEXT = @EXEEXT@
-FFLAGS = @FFLAGS@
-FGREP = @FGREP@
-GCOV = @GCOV@
-GCOV_CFLAGS = @GCOV_CFLAGS@
-GCOV_LIBS = @GCOV_LIBS@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GIO_CFLAGS = @GIO_CFLAGS@
-GIO_LDFLAGS = @GIO_LDFLAGS@
-GIO_LIBS = @GIO_LIBS@
-GLIB_CFLAGS = @GLIB_CFLAGS@
-GLIB_EXTRA_CFLAGS = @GLIB_EXTRA_CFLAGS@
-GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
-GLIB_LIBS = @GLIB_LIBS@
-GLIB_MKENUMS = @GLIB_MKENUMS@
-GLIB_PREFIX = @GLIB_PREFIX@
-GLIB_REQ = @GLIB_REQ@
-GMODULE_NO_EXPORT_CFLAGS = @GMODULE_NO_EXPORT_CFLAGS@
-GMODULE_NO_EXPORT_LIBS = @GMODULE_NO_EXPORT_LIBS@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
-GREP = @GREP@
-GSTPB_PLUGINS_DIR = @GSTPB_PLUGINS_DIR@
-GSTPB_PREFIX = @GSTPB_PREFIX@
-GST_AGE = @GST_AGE@
-GST_ALL_LDFLAGS = @GST_ALL_LDFLAGS@
-GST_API_VERSION = @GST_API_VERSION@
-GST_BASE_CFLAGS = @GST_BASE_CFLAGS@
-GST_BASE_LIBS = @GST_BASE_LIBS@
-GST_CFLAGS = @GST_CFLAGS@
-GST_CHECK_CFLAGS = @GST_CHECK_CFLAGS@
-GST_CHECK_LIBS = @GST_CHECK_LIBS@
-GST_CURRENT = @GST_CURRENT@
-GST_CXXFLAGS = @GST_CXXFLAGS@
-GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@
-GST_LIBS = @GST_LIBS@
-GST_LIBVERSION = @GST_LIBVERSION@
-GST_LICENSE = @GST_LICENSE@
-GST_LT_LDFLAGS = @GST_LT_LDFLAGS@
-GST_OPTION_CFLAGS = @GST_OPTION_CFLAGS@
-GST_OPTION_CXXFLAGS = @GST_OPTION_CXXFLAGS@
-GST_PACKAGE_NAME = @GST_PACKAGE_NAME@
-GST_PACKAGE_ORIGIN = @GST_PACKAGE_ORIGIN@
-GST_PLUGINS_ALL = @GST_PLUGINS_ALL@
-GST_PLUGINS_BASE_CFLAGS = @GST_PLUGINS_BASE_CFLAGS@
-GST_PLUGINS_BASE_DIR = @GST_PLUGINS_BASE_DIR@
-GST_PLUGINS_BASE_LIBS = @GST_PLUGINS_BASE_LIBS@
-GST_PLUGINS_DIR = @GST_PLUGINS_DIR@
-GST_PLUGINS_NONPORTED = @GST_PLUGINS_NONPORTED@
-GST_PLUGINS_SELECTED = @GST_PLUGINS_SELECTED@
-GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
-GST_PLUGIN_LIBTOOLFLAGS = @GST_PLUGIN_LIBTOOLFLAGS@
-GST_PREFIX = @GST_PREFIX@
-GST_REVISION = @GST_REVISION@
-GST_TOOLS_DIR = @GST_TOOLS_DIR@
-GTKDOC_CHECK = @GTKDOC_CHECK@
-GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
-GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
-GTKDOC_MKPDF = @GTKDOC_MKPDF@
-GTKDOC_REBASE = @GTKDOC_REBASE@
-HAVE_CXX = @HAVE_CXX@
-HAVE_DVDREAD = @HAVE_DVDREAD@
-HAVE_LAME = @HAVE_LAME@
-HTML_DIR = @HTML_DIR@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-LAME_CFLAGS = @LAME_CFLAGS@
-LAME_LIBS = @LAME_LIBS@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBM = @LIBM@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LOCALEDIR = @LOCALEDIR@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-LTLIBOBJS = @LTLIBOBJS@
-LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MKDIR_P = @MKDIR_P@
-MPEG2DEC_CFLAGS = @MPEG2DEC_CFLAGS@
-MPEG2DEC_LIBS = @MPEG2DEC_LIBS@
-MPG123_CFLAGS = @MPG123_CFLAGS@
-MPG123_LIBS = @MPG123_LIBS@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-ORCC = @ORCC@
-ORCC_FLAGS = @ORCC_FLAGS@
-ORC_CFLAGS = @ORC_CFLAGS@
-ORC_LIBS = @ORC_LIBS@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PACKAGE_VERSION_MAJOR = @PACKAGE_VERSION_MAJOR@
-PACKAGE_VERSION_MICRO = @PACKAGE_VERSION_MICRO@
-PACKAGE_VERSION_MINOR = @PACKAGE_VERSION_MINOR@
-PACKAGE_VERSION_NANO = @PACKAGE_VERSION_NANO@
-PACKAGE_VERSION_RELEASE = @PACKAGE_VERSION_RELEASE@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PLUGINDIR = @PLUGINDIR@
-POSUB = @POSUB@
-PROFILE_CFLAGS = @PROFILE_CFLAGS@
-PYTHON = @PYTHON@
-PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
-PYTHON_PLATFORM = @PYTHON_PLATFORM@
-PYTHON_PREFIX = @PYTHON_PREFIX@
-PYTHON_VERSION = @PYTHON_VERSION@
-RANLIB = @RANLIB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SIDPLAY_CFLAGS = @SIDPLAY_CFLAGS@
-SIDPLAY_LIBS = @SIDPLAY_LIBS@
-STRIP = @STRIP@
-TWOLAME_CFLAGS = @TWOLAME_CFLAGS@
-TWOLAME_LIBS = @TWOLAME_LIBS@
-USE_NLS = @USE_NLS@
-VALGRIND_CFLAGS = @VALGRIND_CFLAGS@
-VALGRIND_LIBS = @VALGRIND_LIBS@
-VALGRIND_PATH = @VALGRIND_PATH@
-VERSION = @VERSION@
-WARNING_CFLAGS = @WARNING_CFLAGS@
-WARNING_CXXFLAGS = @WARNING_CXXFLAGS@
-WIN32_LIBS = @WIN32_LIBS@
-X264_CFLAGS = @X264_CFLAGS@
-X264_LIBS = @X264_LIBS@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-pkgpyexecdir = @pkgpyexecdir@
-pkgpythondir = @pkgpythondir@
-plugindir = @plugindir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-pyexecdir = @pyexecdir@
-pythondir = @pythondir@
-runstatedir = @runstatedir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target = @target@
-target_alias = @target_alias@
-target_cpu = @target_cpu@
-target_os = @target_os@
-target_vendor = @target_vendor@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-plugin_LTLIBRARIES = libgstlame.la
-libgstlame_la_SOURCES = gstlamemp3enc.c plugin.c
-libgstlame_la_CFLAGS = \
- $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(LAME_CFLAGS)
-
-libgstlame_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) -lgstaudio-$(GST_API_VERSION) \
- $(GST_BASE_LIBS) $(GST_LIBS) $(LAME_LIBS)
-
-libgstlame_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstlame_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
-noinst_HEADERS = gstlamemp3enc.h
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
- && { if test -f $@; then exit 0; else break; fi; }; \
- exit 1;; \
- esac; \
- done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu ext/lame/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu ext/lame/Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- @case '$?' in \
- *config.status*) \
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
- *) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
- esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
- @$(NORMAL_INSTALL)
- @list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \
- list2=; for p in $$list; do \
- if test -f $$p; then \
- list2="$$list2 $$p"; \
- else :; fi; \
- done; \
- test -z "$$list2" || { \
- echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
- $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \
- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \
- }
-
-uninstall-pluginLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
- @list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \
- for p in $$list; do \
- $(am__strip_dir) \
- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$f'"; \
- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$f"; \
- done
-
-clean-pluginLTLIBRARIES:
- -test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES)
- @list='$(plugin_LTLIBRARIES)'; \
- locs=`for p in $$list; do echo $$p; done | \
- sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
- sort -u`; \
- test -z "$$locs" || { \
- echo rm -f $${locs}; \
- rm -f $${locs}; \
- }
-
-libgstlame.la: $(libgstlame_la_OBJECTS) $(libgstlame_la_DEPENDENCIES) $(EXTRA_libgstlame_la_DEPENDENCIES)
- $(AM_V_CCLD)$(libgstlame_la_LINK) -rpath $(plugindir) $(libgstlame_la_OBJECTS) $(libgstlame_la_LIBADD) $(LIBS)
-
-mostlyclean-compile:
- -rm -f *.$(OBJEXT)
-
-distclean-compile:
- -rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstlame_la-gstlamemp3enc.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstlame_la-plugin.Plo@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
-
-.c.obj:
-@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
-@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
-@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
-
-libgstlame_la-gstlamemp3enc.lo: gstlamemp3enc.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstlame_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstlame_la_CFLAGS) $(CFLAGS) -MT libgstlame_la-gstlamemp3enc.lo -MD -MP -MF $(DEPDIR)/libgstlame_la-gstlamemp3enc.Tpo -c -o libgstlame_la-gstlamemp3enc.lo `test -f 'gstlamemp3enc.c' || echo '$(srcdir)/'`gstlamemp3enc.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstlame_la-gstlamemp3enc.Tpo $(DEPDIR)/libgstlame_la-gstlamemp3enc.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gstlamemp3enc.c' object='libgstlame_la-gstlamemp3enc.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstlame_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstlame_la_CFLAGS) $(CFLAGS) -c -o libgstlame_la-gstlamemp3enc.lo `test -f 'gstlamemp3enc.c' || echo '$(srcdir)/'`gstlamemp3enc.c
-
-libgstlame_la-plugin.lo: plugin.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstlame_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstlame_la_CFLAGS) $(CFLAGS) -MT libgstlame_la-plugin.lo -MD -MP -MF $(DEPDIR)/libgstlame_la-plugin.Tpo -c -o libgstlame_la-plugin.lo `test -f 'plugin.c' || echo '$(srcdir)/'`plugin.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstlame_la-plugin.Tpo $(DEPDIR)/libgstlame_la-plugin.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='plugin.c' object='libgstlame_la-plugin.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstlame_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstlame_la_CFLAGS) $(CFLAGS) -c -o libgstlame_la-plugin.lo `test -f 'plugin.c' || echo '$(srcdir)/'`plugin.c
-
-mostlyclean-libtool:
- -rm -f *.lo
-
-clean-libtool:
- -rm -rf .libs _libs
-
-ID: $(am__tagged_files)
- $(am__define_uniq_tagged_files); mkid -fID $$unique
-tags: tags-am
-TAGS: tags
-
-tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
- set x; \
- here=`pwd`; \
- $(am__define_uniq_tagged_files); \
- shift; \
- if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- if test $$# -gt 0; then \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- "$$@" $$unique; \
- else \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$unique; \
- fi; \
- fi
-ctags: ctags-am
-
-CTAGS: ctags
-ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
- $(am__define_uniq_tagged_files); \
- test -z "$(CTAGS_ARGS)$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$unique
-
-GTAGS:
- here=`$(am__cd) $(top_builddir) && pwd` \
- && $(am__cd) $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) "$$here"
-cscopelist: cscopelist-am
-
-cscopelist-am: $(am__tagged_files)
- list='$(am__tagged_files)'; \
- case "$(srcdir)" in \
- [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
- *) sdir=$(subdir)/$(srcdir) ;; \
- esac; \
- for i in $$list; do \
- if test -f "$$i"; then \
- echo "$(subdir)/$$i"; \
- else \
- echo "$$sdir/$$i"; \
- fi; \
- done >> $(top_builddir)/cscope.files
-
-distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
- list='$(DISTFILES)'; \
- dist_files=`for file in $$list; do echo $$file; done | \
- sed -e "s|^$$srcdirstrip/||;t" \
- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
- case $$dist_files in \
- */*) $(MKDIR_P) `echo "$$dist_files" | \
- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
- sort -u` ;; \
- esac; \
- for file in $$dist_files; do \
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- if test -d $$d/$$file; then \
- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test -d "$(distdir)/$$file"; then \
- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
- fi; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
- fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
- else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
- || exit 1; \
- fi; \
- done
-check-am: all-am
-check: check-am
-all-am: Makefile $(LTLIBRARIES) $(HEADERS)
-installdirs:
- for dir in "$(DESTDIR)$(plugindir)"; do \
- test -z "$$dir" || $(MKDIR_P) "$$dir"; \
- done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
- if test -z '$(STRIP)'; then \
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- install; \
- else \
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
- fi
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
- -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
- @echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool clean-pluginLTLIBRARIES \
- mostlyclean-am
-
-distclean: distclean-am
- -rm -rf ./$(DEPDIR)
- -rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
- distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-pluginLTLIBRARIES
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
- -rm -rf ./$(DEPDIR)
- -rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
- mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-pluginLTLIBRARIES
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
- clean-libtool clean-pluginLTLIBRARIES cscopelist-am ctags \
- ctags-am distclean distclean-compile distclean-generic \
- distclean-libtool distclean-tags distdir dvi dvi-am html \
- html-am info info-am install install-am install-data \
- install-data-am install-dvi install-dvi-am install-exec \
- install-exec-am install-html install-html-am install-info \
- install-info-am install-man install-pdf install-pdf-am \
- install-pluginLTLIBRARIES install-ps install-ps-am \
- install-strip installcheck installcheck-am installdirs \
- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
- pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
- uninstall-pluginLTLIBRARIES
-
-.PRECIOUS: Makefile
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/ext/lame/gstlamemp3enc.c b/ext/lame/gstlamemp3enc.c
deleted file mode 100644
index a4a637a..0000000
--- a/ext/lame/gstlamemp3enc.c
+++ /dev/null
@@ -1,934 +0,0 @@
-/* GStreamer
- * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu>
- * Copyright (C) <2004> Wim Taymans <wim@fluendo.com>
- * Copyright (C) <2005> Thomas Vander Stichele <thomas at apestaart dot org>
- * Copyright (C) <2009> Sebastian Dröge <sebastian.droege@collabora.co.uk>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-/**
- * SECTION:element-lamemp3enc
- * @see_also: lame, mad, vorbisenc
- *
- * This element encodes raw integer audio into an MPEG-1 layer 3 (MP3) stream.
- * Note that <ulink url="http://en.wikipedia.org/wiki/MP3">MP3</ulink> is not
- * a free format, there are licensing and patent issues to take into
- * consideration. See <ulink url="http://www.vorbis.com/">Ogg/Vorbis</ulink>
- * for a royalty free (and often higher quality) alternative.
- *
- * <refsect2>
- * <title>Output sample rate</title>
- * If no fixed output sample rate is negotiated on the element's src pad,
- * the element will choose an optimal sample rate to resample to internally.
- * For example, a 16-bit 44.1 KHz mono audio stream encoded at 48 kbit will
- * get resampled to 32 KHz. Use filter caps on the src pad to force a
- * particular sample rate.
- * </refsect2>
- * <refsect2>
- * <title>Example pipelines</title>
- * |[
- * gst-launch-1.0 -v audiotestsrc wave=sine num-buffers=100 ! audioconvert ! lamemp3enc ! filesink location=sine.mp3
- * ]| Encode a test sine signal to MP3.
- * |[
- * gst-launch-1.0 -v autoaudiosrc ! audioconvert ! lamemp3enc target=bitrate bitrate=192 ! filesink location=alsasrc.mp3
- * ]| Record from a sound card using ALSA and encode to MP3 with an average bitrate of 192kbps
- * |[
- * gst-launch-1.0 -v filesrc location=music.wav ! decodebin ! audioconvert ! audioresample ! lamemp3enc target=quality quality=0 ! id3v2mux ! filesink location=music.mp3
- * ]| Transcode from a .wav file to MP3 (the id3v2mux element is optional) with best VBR quality
- * |[
- * gst-launch-1.0 -v cdda://5 ! audioconvert ! lamemp3enc target=bitrate cbr=true bitrate=192 ! filesink location=track5.mp3
- * ]| Encode Audio CD track 5 to MP3 with a constant bitrate of 192kbps
- * |[
- * gst-launch-1.0 -v audiotestsrc num-buffers=10 ! audio/x-raw,rate=44100,channels=1 ! lamemp3enc target=bitrate cbr=true bitrate=48 ! filesink location=test.mp3
- * ]| Encode to a fixed sample rate
- * </refsect2>
- *
- * Since: 0.10.12
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <string.h>
-#include "gstlamemp3enc.h"
-#include <gst/gst-i18n-plugin.h>
-
-/* lame < 3.98 */
-#ifndef HAVE_LAME_SET_VBR_QUALITY
-#define lame_set_VBR_quality(flags,q) lame_set_VBR_q((flags),(int)(q))
-#endif
-
-GST_DEBUG_CATEGORY_STATIC (debug);
-#define GST_CAT_DEFAULT debug
-
-/* elementfactory information */
-
-/* LAMEMP3ENC can do MPEG-1, MPEG-2, and MPEG-2.5, so it has 9 possible
- * sample rates it supports */
-static GstStaticPadTemplate gst_lamemp3enc_sink_template =
- GST_STATIC_PAD_TEMPLATE ("sink",
- GST_PAD_SINK,
- GST_PAD_ALWAYS,
- GST_STATIC_CAPS ("audio/x-raw, "
- "format = (string) " GST_AUDIO_NE (S16) ", "
- "layout = (string) interleaved, "
- "rate = (int) { 8000, 11025, 12000, 16000, 22050, 24000, 32000, 44100, 48000 }, "
- "channels = (int) 1; "
- "audio/x-raw, "
- "format = (string) " GST_AUDIO_NE (S16) ", "
- "layout = (string) interleaved, "
- "rate = (int) { 8000, 11025, 12000, 16000, 22050, 24000, 32000, 44100, 48000 }, "
- "channels = (int) 2, " "channel-mask = (bitmask) 0x3")
- );
-
-static GstStaticPadTemplate gst_lamemp3enc_src_template =
-GST_STATIC_PAD_TEMPLATE ("src",
- GST_PAD_SRC,
- GST_PAD_ALWAYS,
- GST_STATIC_CAPS ("audio/mpeg, "
- "mpegversion = (int) 1, "
- "layer = (int) 3, "
- "rate = (int) { 8000, 11025, 12000, 16000, 22050, 24000, 32000, 44100, 48000 }, "
- "channels = (int) [ 1, 2 ]")
- );
-
-/********** Define useful types for non-programmatic interfaces **********/
-enum
-{
- LAMEMP3ENC_TARGET_QUALITY = 0,
- LAMEMP3ENC_TARGET_BITRATE
-};
-
-#define GST_TYPE_LAMEMP3ENC_TARGET (gst_lamemp3enc_target_get_type())
-static GType
-gst_lamemp3enc_target_get_type (void)
-{
- static GType lame_target_type = 0;
- static const GEnumValue lame_targets[] = {
- {LAMEMP3ENC_TARGET_QUALITY, "Quality", "quality"},
- {LAMEMP3ENC_TARGET_BITRATE, "Bitrate", "bitrate"},
- {0, NULL, NULL}
- };
-
- if (!lame_target_type) {
- lame_target_type =
- g_enum_register_static ("GstLameMP3EncTarget", lame_targets);
- }
- return lame_target_type;
-}
-
-enum
-{
- LAMEMP3ENC_ENCODING_ENGINE_QUALITY_FAST = 0,
- LAMEMP3ENC_ENCODING_ENGINE_QUALITY_STANDARD,
- LAMEMP3ENC_ENCODING_ENGINE_QUALITY_HIGH
-};
-
-#define GST_TYPE_LAMEMP3ENC_ENCODING_ENGINE_QUALITY (gst_lamemp3enc_encoding_engine_quality_get_type())
-static GType
-gst_lamemp3enc_encoding_engine_quality_get_type (void)
-{
- static GType lame_encoding_engine_quality_type = 0;
- static const GEnumValue lame_encoding_engine_quality[] = {
- {0, "Fast", "fast"},
- {1, "Standard", "standard"},
- {2, "High", "high"},
- {0, NULL, NULL}
- };
-
- if (!lame_encoding_engine_quality_type) {
- lame_encoding_engine_quality_type =
- g_enum_register_static ("GstLameMP3EncEncodingEngineQuality",
- lame_encoding_engine_quality);
- }
- return lame_encoding_engine_quality_type;
-}
-
-/********** Standard stuff for signals and arguments **********/
-
-enum
-{
- ARG_0,
- ARG_TARGET,
- ARG_BITRATE,
- ARG_CBR,
- ARG_QUALITY,
- ARG_ENCODING_ENGINE_QUALITY,
- ARG_MONO
-};
-
-#define DEFAULT_TARGET LAMEMP3ENC_TARGET_QUALITY
-#define DEFAULT_BITRATE 128
-#define DEFAULT_CBR FALSE
-#define DEFAULT_QUALITY 4
-#define DEFAULT_ENCODING_ENGINE_QUALITY LAMEMP3ENC_ENCODING_ENGINE_QUALITY_STANDARD
-#define DEFAULT_MONO FALSE
-
-static gboolean gst_lamemp3enc_start (GstAudioEncoder * enc);
-static gboolean gst_lamemp3enc_stop (GstAudioEncoder * enc);
-static gboolean gst_lamemp3enc_set_format (GstAudioEncoder * enc,
- GstAudioInfo * info);
-static GstFlowReturn gst_lamemp3enc_handle_frame (GstAudioEncoder * enc,
- GstBuffer * in_buf);
-static void gst_lamemp3enc_flush (GstAudioEncoder * enc);
-
-static void gst_lamemp3enc_set_property (GObject * object, guint prop_id,
- const GValue * value, GParamSpec * pspec);
-static void gst_lamemp3enc_get_property (GObject * object, guint prop_id,
- GValue * value, GParamSpec * pspec);
-static gboolean gst_lamemp3enc_setup (GstLameMP3Enc * lame, GstTagList ** tags);
-
-#define gst_lamemp3enc_parent_class parent_class
-G_DEFINE_TYPE (GstLameMP3Enc, gst_lamemp3enc, GST_TYPE_AUDIO_ENCODER);
-
-static void
-gst_lamemp3enc_release_memory (GstLameMP3Enc * lame)
-{
- if (lame->lgf) {
- lame_close (lame->lgf);
- lame->lgf = NULL;
- }
-}
-
-static void
-gst_lamemp3enc_finalize (GObject * obj)
-{
- gst_lamemp3enc_release_memory (GST_LAMEMP3ENC (obj));
-
- G_OBJECT_CLASS (parent_class)->finalize (obj);
-}
-
-static void
-gst_lamemp3enc_class_init (GstLameMP3EncClass * klass)
-{
- GObjectClass *gobject_class;
- GstElementClass *gstelement_class;
- GstAudioEncoderClass *base_class;
-
- gobject_class = (GObjectClass *) klass;
- gstelement_class = (GstElementClass *) klass;
- base_class = (GstAudioEncoderClass *) klass;
-
- gobject_class->set_property = gst_lamemp3enc_set_property;
- gobject_class->get_property = gst_lamemp3enc_get_property;
- gobject_class->finalize = gst_lamemp3enc_finalize;
-
- gst_element_class_add_static_pad_template (gstelement_class,
- &gst_lamemp3enc_src_template);
- gst_element_class_add_static_pad_template (gstelement_class,
- &gst_lamemp3enc_sink_template);
-
- gst_element_class_set_static_metadata (gstelement_class,
- "L.A.M.E. mp3 encoder", "Codec/Encoder/Audio",
- "High-quality free MP3 encoder",
- "Sebastian Dröge <sebastian.droege@collabora.co.uk>");
-
- base_class->start = GST_DEBUG_FUNCPTR (gst_lamemp3enc_start);
- base_class->stop = GST_DEBUG_FUNCPTR (gst_lamemp3enc_stop);
- base_class->set_format = GST_DEBUG_FUNCPTR (gst_lamemp3enc_set_format);
- base_class->handle_frame = GST_DEBUG_FUNCPTR (gst_lamemp3enc_handle_frame);
- base_class->flush = GST_DEBUG_FUNCPTR (gst_lamemp3enc_flush);
-
- g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_TARGET,
- g_param_spec_enum ("target", "Target",
- "Optimize for quality or bitrate", GST_TYPE_LAMEMP3ENC_TARGET,
- DEFAULT_TARGET,
- G_PARAM_CONSTRUCT | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
- g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_BITRATE,
- g_param_spec_int ("bitrate", "Bitrate (kb/s)",
- "Bitrate in kbit/sec (Only valid if target is bitrate, for CBR one "
- "of 8, 16, 24, 32, 40, 48, 56, 64, 80, 96, 112, 128, 160, 192, 224, "
- "256 or 320)", 8, 320, DEFAULT_BITRATE,
- G_PARAM_CONSTRUCT | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
- g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_CBR,
- g_param_spec_boolean ("cbr", "CBR", "Enforce constant bitrate encoding "
- "(Only valid if target is bitrate)", DEFAULT_CBR,
- G_PARAM_CONSTRUCT | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
- g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_QUALITY,
- g_param_spec_float ("quality", "Quality",
- "VBR Quality from 0 to 10, 0 being the best "
- "(Only valid if target is quality)", 0.0, 9.999,
- DEFAULT_QUALITY,
- G_PARAM_CONSTRUCT | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
- g_object_class_install_property (G_OBJECT_CLASS (klass),
- ARG_ENCODING_ENGINE_QUALITY, g_param_spec_enum ("encoding-engine-quality",
- "Encoding Engine Quality", "Quality/speed of the encoding engine, "
- "this does not affect the bitrate!",
- GST_TYPE_LAMEMP3ENC_ENCODING_ENGINE_QUALITY,
- DEFAULT_ENCODING_ENGINE_QUALITY,
- G_PARAM_CONSTRUCT | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
- g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_MONO,
- g_param_spec_boolean ("mono", "Mono", "Enforce mono encoding",
- DEFAULT_MONO,
- G_PARAM_CONSTRUCT | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
-}
-
-static void
-gst_lamemp3enc_init (GstLameMP3Enc * lame)
-{
- GST_PAD_SET_ACCEPT_TEMPLATE (GST_AUDIO_ENCODER_SINK_PAD (lame));
-}
-
-static gboolean
-gst_lamemp3enc_start (GstAudioEncoder * enc)
-{
- GstLameMP3Enc *lame = GST_LAMEMP3ENC (enc);
-
- GST_DEBUG_OBJECT (lame, "start");
-
- if (!lame->adapter)
- lame->adapter = gst_adapter_new ();
- gst_adapter_clear (lame->adapter);
-
- return TRUE;
-}
-
-static gboolean
-gst_lamemp3enc_stop (GstAudioEncoder * enc)
-{
- GstLameMP3Enc *lame = GST_LAMEMP3ENC (enc);
-
- GST_DEBUG_OBJECT (lame, "stop");
-
- if (lame->adapter) {
- g_object_unref (lame->adapter);
- lame->adapter = NULL;
- }
-
- gst_lamemp3enc_release_memory (lame);
- return TRUE;
-}
-
-static gboolean
-gst_lamemp3enc_set_format (GstAudioEncoder * enc, GstAudioInfo * info)
-{
- GstLameMP3Enc *lame;
- gint out_samplerate;
- gint version;
- GstCaps *othercaps;
- GstClockTime latency;
- GstTagList *tags = NULL;
-
- lame = GST_LAMEMP3ENC (enc);
-
- /* parameters already parsed for us */
- lame->samplerate = GST_AUDIO_INFO_RATE (info);
- lame->num_channels = GST_AUDIO_INFO_CHANNELS (info);
-
- /* but we might be asked to reconfigure, so reset */
- gst_lamemp3enc_release_memory (lame);
-
- GST_DEBUG_OBJECT (lame, "setting up lame");
- if (!gst_lamemp3enc_setup (lame, &tags))
- goto setup_failed;
-
- out_samplerate = lame_get_out_samplerate (lame->lgf);
- if (out_samplerate == 0)
- goto zero_output_rate;
- if (out_samplerate != lame->samplerate) {
- GST_WARNING_OBJECT (lame,
- "output samplerate %d is different from incoming samplerate %d",
- out_samplerate, lame->samplerate);
- }
- lame->out_samplerate = out_samplerate;
-
- version = lame_get_version (lame->lgf);
- if (version == 0)
- version = 2;
- else if (version == 1)
- version = 1;
- else if (version == 2)
- version = 3;
-
- othercaps =
- gst_caps_new_simple ("audio/mpeg",
- "mpegversion", G_TYPE_INT, 1,
- "mpegaudioversion", G_TYPE_INT, version,
- "layer", G_TYPE_INT, 3,
- "channels", G_TYPE_INT, lame->mono ? 1 : lame->num_channels,
- "rate", G_TYPE_INT, out_samplerate, NULL);
-
- /* and use these caps */
- gst_audio_encoder_set_output_format (GST_AUDIO_ENCODER (enc), othercaps);
- gst_caps_unref (othercaps);
-
- /* base class feedback:
- * - we will handle buffers, just hand us all available
- * - report latency */
- latency = gst_util_uint64_scale_int (lame_get_framesize (lame->lgf),
- GST_SECOND, lame->samplerate);
- gst_audio_encoder_set_latency (enc, latency, latency);
-
- if (tags) {
- gst_audio_encoder_merge_tags (enc, tags, GST_TAG_MERGE_REPLACE);
- gst_tag_list_unref (tags);
- }
-
- return TRUE;
-
-zero_output_rate:
- {
- if (tags)
- gst_tag_list_unref (tags);
- GST_ELEMENT_ERROR (lame, LIBRARY, SETTINGS, (NULL),
- ("LAME mp3 audio decided on a zero sample rate"));
- return FALSE;
- }
-setup_failed:
- {
- GST_ELEMENT_ERROR (lame, LIBRARY, SETTINGS,
- (_("Failed to configure LAME mp3 audio encoder. Check your encoding parameters.")), (NULL));
- return FALSE;
- }
-}
-
-/* <php-emulation-mode>three underscores for ___rate is really really really
- * private as opposed to one underscore<php-emulation-mode> */
-/* call this MACRO outside of the NULL state so that we have a higher chance
- * of actually having a pipeline and bus to get the message through */
-
-#define CHECK_AND_FIXUP_BITRATE(obj,param,rate) \
-G_STMT_START { \
- gint ___rate = rate; \
- gint maxrate = 320; \
- gint multiplier = 64; \
- if (rate == 0) { \
- ___rate = rate; \
- } else if (rate <= 64) { \
- maxrate = 64; multiplier = 8; \
- if ((rate % 8) != 0) ___rate = GST_ROUND_UP_8 (rate); \
- } else if (rate <= 128) { \
- maxrate = 128; multiplier = 16; \
- if ((rate % 16) != 0) ___rate = GST_ROUND_UP_16 (rate); \
- } else if (rate <= 256) { \
- maxrate = 256; multiplier = 32; \
- if ((rate % 32) != 0) ___rate = GST_ROUND_UP_32 (rate); \
- } else if (rate <= 320) { \
- maxrate = 320; multiplier = 64; \
- if ((rate % 64) != 0) ___rate = GST_ROUND_UP_64 (rate); \
- } \
- if (___rate != rate) { \
- GST_ELEMENT_WARNING (obj, LIBRARY, SETTINGS, \
- (_("The requested bitrate %d kbit/s for property '%s' " \
- "is not allowed. " \
- "The bitrate was changed to %d kbit/s."), rate, \
- param, ___rate), \
- ("A bitrate below %d should be a multiple of %d.", \
- maxrate, multiplier)); \
- rate = ___rate; \
- } \
-} G_STMT_END
-
-static void
-gst_lamemp3enc_set_property (GObject * object, guint prop_id,
- const GValue * value, GParamSpec * pspec)
-{
- GstLameMP3Enc *lame;
-
- lame = GST_LAMEMP3ENC (object);
-
- switch (prop_id) {
- case ARG_TARGET:
- lame->target = g_value_get_enum (value);
- break;
- case ARG_BITRATE:
- lame->bitrate = g_value_get_int (value);
- break;
- case ARG_CBR:
- lame->cbr = g_value_get_boolean (value);
- break;
- case ARG_QUALITY:
- lame->quality = g_value_get_float (value);
- break;
- case ARG_ENCODING_ENGINE_QUALITY:
- lame->encoding_engine_quality = g_value_get_enum (value);
- break;
- case ARG_MONO:
- lame->mono = g_value_get_boolean (value);
- break;
- default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
- break;
- }
-}
-
-static void
-gst_lamemp3enc_get_property (GObject * object, guint prop_id, GValue * value,
- GParamSpec * pspec)
-{
- GstLameMP3Enc *lame;
-
- lame = GST_LAMEMP3ENC (object);
-
- switch (prop_id) {
- case ARG_TARGET:
- g_value_set_enum (value, lame->target);
- break;
- case ARG_BITRATE:
- g_value_set_int (value, lame->bitrate);
- break;
- case ARG_CBR:
- g_value_set_boolean (value, lame->cbr);
- break;
- case ARG_QUALITY:
- g_value_set_float (value, lame->quality);
- break;
- case ARG_ENCODING_ENGINE_QUALITY:
- g_value_set_enum (value, lame->encoding_engine_quality);
- break;
- case ARG_MONO:
- g_value_set_boolean (value, lame->mono);
- break;
- default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
- break;
- }
-}
-
-/* **** credits go to mpegaudioparse **** */
-
-static const guint mp3types_bitrates[2][3][16] = {
- {
- {0, 32, 64, 96, 128, 160, 192, 224, 256, 288, 320, 352, 384, 416, 448,},
- {0, 32, 48, 56, 64, 80, 96, 112, 128, 160, 192, 224, 256, 320, 384,},
- {0, 32, 40, 48, 56, 64, 80, 96, 112, 128, 160, 192, 224, 256, 320,}
- },
- {
- {0, 32, 48, 56, 64, 80, 96, 112, 128, 144, 160, 176, 192, 224, 256,},
- {0, 8, 16, 24, 32, 40, 48, 56, 64, 80, 96, 112, 128, 144, 160,},
- {0, 8, 16, 24, 32, 40, 48, 56, 64, 80, 96, 112, 128, 144, 160,}
- },
-};
-
-static const guint mp3types_freqs[3][3] = { {44100, 48000, 32000},
-{22050, 24000, 16000},
-{11025, 12000, 8000}
-};
-
-static inline guint
-mp3_type_frame_length_from_header (GstLameMP3Enc * lame, guint32 header,
- guint * put_version, guint * put_layer, guint * put_channels,
- guint * put_bitrate, guint * put_samplerate, guint * put_mode,
- guint * put_crc)
-{
- guint length;
- gulong mode, samplerate, bitrate, layer, channels, padding, crc;
- gulong version;
- gint lsf, mpg25;
-
- if (header & (1 << 20)) {
- lsf = (header & (1 << 19)) ? 0 : 1;
- mpg25 = 0;
- } else {
- lsf = 1;
- mpg25 = 1;
- }
-
- version = 1 + lsf + mpg25;
-
- layer = 4 - ((header >> 17) & 0x3);
-
- crc = (header >> 16) & 0x1;
-
- bitrate = (header >> 12) & 0xF;
- bitrate = mp3types_bitrates[lsf][layer - 1][bitrate] * 1000;
- /* The caller has ensured we have a valid header, so bitrate can't be
- zero here. */
- g_assert (bitrate != 0);
-
- samplerate = (header >> 10) & 0x3;
- samplerate = mp3types_freqs[lsf + mpg25][samplerate];
-
- padding = (header >> 9) & 0x1;
-
- mode = (header >> 6) & 0x3;
- channels = (mode == 3) ? 1 : 2;
-
- switch (layer) {
- case 1:
- length = 4 * ((bitrate * 12) / samplerate + padding);
- break;
- case 2:
- length = (bitrate * 144) / samplerate + padding;
- break;
- default:
- case 3:
- length = (bitrate * 144) / (samplerate << lsf) + padding;
- break;
- }
-
- GST_DEBUG_OBJECT (lame, "Calculated mp3 frame length of %u bytes", length);
- GST_DEBUG_OBJECT (lame, "samplerate = %lu, bitrate = %lu, version = %lu, "
- "layer = %lu, channels = %lu", samplerate, bitrate, version,
- layer, channels);
-
- if (put_version)
- *put_version = version;
- if (put_layer)
- *put_layer = layer;
- if (put_channels)
- *put_channels = channels;
- if (put_bitrate)
- *put_bitrate = bitrate;
- if (put_samplerate)
- *put_samplerate = samplerate;
- if (put_mode)
- *put_mode = mode;
- if (put_crc)
- *put_crc = crc;
-
- return length;
-}
-
-static gboolean
-mp3_sync_check (GstLameMP3Enc * lame, unsigned long head)
-{
- GST_DEBUG_OBJECT (lame, "checking mp3 header 0x%08lx", head);
- /* if it's not a valid sync */
- if ((head & 0xffe00000) != 0xffe00000) {
- GST_WARNING_OBJECT (lame, "invalid sync");
- return FALSE;
- }
- /* if it's an invalid MPEG version */
- if (((head >> 19) & 3) == 0x1) {
- GST_WARNING_OBJECT (lame, "invalid MPEG version: 0x%lx", (head >> 19) & 3);
- return FALSE;
- }
- /* if it's an invalid layer */
- if (!((head >> 17) & 3)) {
- GST_WARNING_OBJECT (lame, "invalid layer: 0x%lx", (head >> 17) & 3);
- return FALSE;
- }
- /* if it's an invalid bitrate */
- if (((head >> 12) & 0xf) == 0x0) {
- GST_WARNING_OBJECT (lame, "invalid bitrate: 0x%lx."
- "Free format files are not supported yet", (head >> 12) & 0xf);
- return FALSE;
- }
- if (((head >> 12) & 0xf) == 0xf) {
- GST_WARNING_OBJECT (lame, "invalid bitrate: 0x%lx", (head >> 12) & 0xf);
- return FALSE;
- }
- /* if it's an invalid samplerate */
- if (((head >> 10) & 0x3) == 0x3) {
- GST_WARNING_OBJECT (lame, "invalid samplerate: 0x%lx", (head >> 10) & 0x3);
- return FALSE;
- }
-
- if ((head & 0x3) == 0x2) {
- /* Ignore this as there are some files with emphasis 0x2 that can
- * be played fine. See BGO #537235 */
- GST_WARNING_OBJECT (lame, "invalid emphasis: 0x%lx", head & 0x3);
- }
-
- return TRUE;
-}
-
-/* **** end mpegaudioparse **** */
-
-static GstFlowReturn
-gst_lamemp3enc_finish_frames (GstLameMP3Enc * lame)
-{
- gint av;
- guint header;
- GstFlowReturn result = GST_FLOW_OK;
-
- /* limited parsing, we don't expect to lose sync here */
- while ((result == GST_FLOW_OK) &&
- ((av = gst_adapter_available (lame->adapter)) > 4)) {
- guint rate, version, layer, size;
- GstBuffer *mp3_buf;
- const guint8 *data;
- guint samples_per_frame;
-
- data = gst_adapter_map (lame->adapter, 4);
- header = GST_READ_UINT32_BE (data);
- gst_adapter_unmap (lame->adapter);
-
- if (!mp3_sync_check (lame, header))
- goto invalid_header;
-
- size = mp3_type_frame_length_from_header (lame, header, &version, &layer,
- NULL, NULL, &rate, NULL, NULL);
-
- if (G_UNLIKELY (layer != 3 || rate != lame->out_samplerate)) {
- GST_DEBUG_OBJECT (lame,
- "unexpected mp3 header with rate %u, version %u, layer %u",
- rate, version, layer);
- goto invalid_header;
- }
-
- if (size > av) {
- /* pretty likely to occur when lame is holding back on us */
- GST_LOG_OBJECT (lame, "frame size %u (> %d)", size, av);
- break;
- }
-
- /* Account for the internal resampling, finish frame really wants to
- * know about the number of incoming samples
- */
- samples_per_frame = (version == 1) ? 1152 : 576;
- samples_per_frame *= lame->samplerate;
- samples_per_frame /= lame->out_samplerate;
-
- /* should be ok now */
- mp3_buf = gst_adapter_take_buffer (lame->adapter, size);
- /* number of samples for MPEG-1, layer 3 */
- result = gst_audio_encoder_finish_frame (GST_AUDIO_ENCODER (lame),
- mp3_buf, samples_per_frame);
- }
-
-exit:
- return result;
-
- /* ERRORS */
-invalid_header:
- {
- GST_ELEMENT_ERROR (lame, STREAM, ENCODE,
- ("invalid lame mp3 sync header %08X", header), (NULL));
- result = GST_FLOW_ERROR;
- goto exit;
- }
-}
-
-static GstFlowReturn
-gst_lamemp3enc_flush_full (GstLameMP3Enc * lame, gboolean push)
-{
- GstBuffer *buf;
- GstMapInfo map;
- gint size;
- GstFlowReturn result = GST_FLOW_OK;
- gint av;
-
- if (!lame->lgf)
- return GST_FLOW_OK;
-
- buf = gst_buffer_new_and_alloc (7200);
- gst_buffer_map (buf, &map, GST_MAP_WRITE);
- size = lame_encode_flush (lame->lgf, map.data, 7200);
-
- if (size > 0) {
- gst_buffer_unmap (buf, &map);
- gst_buffer_resize (buf, 0, size);
- GST_DEBUG_OBJECT (lame, "collecting final %d bytes", size);
- gst_adapter_push (lame->adapter, buf);
- } else {
- gst_buffer_unmap (buf, &map);
- GST_DEBUG_OBJECT (lame, "no final packet (size=%d, push=%d)", size, push);
- gst_buffer_unref (buf);
- result = GST_FLOW_OK;
- }
-
- if (push) {
- result = gst_lamemp3enc_finish_frames (lame);
- } else {
- /* never mind */
- gst_adapter_clear (lame->adapter);
- }
-
- /* either way, we expect nothing left */
- if ((av = gst_adapter_available (lame->adapter))) {
- /* should this be more fatal ?? */
- GST_WARNING_OBJECT (lame, "unparsed %d bytes left after flushing", av);
- /* clean up anyway */
- gst_adapter_clear (lame->adapter);
- }
-
- return result;
-}
-
-static void
-gst_lamemp3enc_flush (GstAudioEncoder * enc)
-{
- gst_lamemp3enc_flush_full (GST_LAMEMP3ENC (enc), FALSE);
-}
-
-static GstFlowReturn
-gst_lamemp3enc_handle_frame (GstAudioEncoder * enc, GstBuffer * in_buf)
-{
- GstLameMP3Enc *lame;
- gint mp3_buffer_size, mp3_size;
- GstBuffer *mp3_buf;
- GstFlowReturn result;
- gint num_samples;
- GstMapInfo in_map, mp3_map;
-
- lame = GST_LAMEMP3ENC (enc);
-
- /* squeeze remaining and push */
- if (G_UNLIKELY (in_buf == NULL))
- return gst_lamemp3enc_flush_full (lame, TRUE);
-
- gst_buffer_map (in_buf, &in_map, GST_MAP_READ);
-
- num_samples = in_map.size / 2;
-
- /* allocate space for output */
- mp3_buffer_size = 1.25 * num_samples + 7200;
- mp3_buf = gst_buffer_new_allocate (NULL, mp3_buffer_size, NULL);
- gst_buffer_map (mp3_buf, &mp3_map, GST_MAP_WRITE);
-
- /* lame seems to be too stupid to get mono interleaved going */
- if (lame->num_channels == 1) {
- mp3_size = lame_encode_buffer (lame->lgf,
- (short int *) in_map.data,
- (short int *) in_map.data, num_samples, mp3_map.data, mp3_buffer_size);
- } else {
- mp3_size = lame_encode_buffer_interleaved (lame->lgf,
- (short int *) in_map.data,
- num_samples / lame->num_channels, mp3_map.data, mp3_buffer_size);
- }
- gst_buffer_unmap (in_buf, &in_map);
-
- GST_LOG_OBJECT (lame, "encoded %" G_GSIZE_FORMAT " bytes of audio "
- "to %d bytes of mp3", in_map.size, mp3_size);
-
- if (G_LIKELY (mp3_size > 0)) {
- /* unfortunately lame does not provide frame delineated output,
- * so collect output and parse into frames ... */
- gst_buffer_unmap (mp3_buf, &mp3_map);
- gst_buffer_resize (mp3_buf, 0, mp3_size);
- gst_adapter_push (lame->adapter, mp3_buf);
- result = gst_lamemp3enc_finish_frames (lame);
- } else {
- gst_buffer_unmap (mp3_buf, &mp3_map);
- if (mp3_size < 0) {
- /* eat error ? */
- g_warning ("error %d", mp3_size);
- }
- gst_buffer_unref (mp3_buf);
- result = GST_FLOW_OK;
- }
-
- return result;
-}
-
-/* set up the encoder state */
-static gboolean
-gst_lamemp3enc_setup (GstLameMP3Enc * lame, GstTagList ** tags)
-{
- gboolean res;
-
-#define CHECK_ERROR(command) G_STMT_START {\
- if ((command) < 0) { \
- GST_ERROR_OBJECT (lame, "setup failed: " G_STRINGIFY (command)); \
- if (*tags) { \
- gst_tag_list_unref (*tags); \
- *tags = NULL; \
- } \
- return FALSE; \
- } \
-}G_STMT_END
-
- int retval;
- GstCaps *allowed_caps;
-
- GST_DEBUG_OBJECT (lame, "starting setup");
-
- lame->lgf = lame_init ();
-
- if (lame->lgf == NULL)
- return FALSE;
-
- *tags = gst_tag_list_new_empty ();
-
- /* copy the parameters over */
- lame_set_in_samplerate (lame->lgf, lame->samplerate);
-
- /* let lame choose default samplerate unless outgoing sample rate is fixed */
- allowed_caps = gst_pad_get_allowed_caps (GST_AUDIO_ENCODER_SRC_PAD (lame));
-
- if (allowed_caps != NULL) {
- GstStructure *structure;
- gint samplerate;
-
- structure = gst_caps_get_structure (allowed_caps, 0);
-
- if (gst_structure_get_int (structure, "rate", &samplerate)) {
- GST_DEBUG_OBJECT (lame, "Setting sample rate to %d as fixed in src caps",
- samplerate);
- lame_set_out_samplerate (lame->lgf, samplerate);
- } else {
- GST_DEBUG_OBJECT (lame, "Letting lame choose sample rate");
- lame_set_out_samplerate (lame->lgf, 0);
- }
- gst_caps_unref (allowed_caps);
- allowed_caps = NULL;
- } else {
- GST_DEBUG_OBJECT (lame, "No peer yet, letting lame choose sample rate");
- lame_set_out_samplerate (lame->lgf, 0);
- }
-
- CHECK_ERROR (lame_set_num_channels (lame->lgf, lame->num_channels));
- CHECK_ERROR (lame_set_bWriteVbrTag (lame->lgf, 0));
-
- if (lame->target == LAMEMP3ENC_TARGET_QUALITY) {
- CHECK_ERROR (lame_set_VBR (lame->lgf, vbr_default));
- CHECK_ERROR (lame_set_VBR_quality (lame->lgf, lame->quality));
- } else {
- if (lame->cbr) {
- CHECK_AND_FIXUP_BITRATE (lame, "bitrate", lame->bitrate);
- CHECK_ERROR (lame_set_VBR (lame->lgf, vbr_off));
- CHECK_ERROR (lame_set_brate (lame->lgf, lame->bitrate));
- } else {
- CHECK_ERROR (lame_set_VBR (lame->lgf, vbr_abr));
- CHECK_ERROR (lame_set_VBR_mean_bitrate_kbps (lame->lgf, lame->bitrate));
- }
- gst_tag_list_add (*tags, GST_TAG_MERGE_REPLACE, GST_TAG_BITRATE,
- lame->bitrate * 1000, NULL);
- }
-
- if (lame->encoding_engine_quality == LAMEMP3ENC_ENCODING_ENGINE_QUALITY_FAST)
- CHECK_ERROR (lame_set_quality (lame->lgf, 7));
- else if (lame->encoding_engine_quality ==
- LAMEMP3ENC_ENCODING_ENGINE_QUALITY_HIGH)
- CHECK_ERROR (lame_set_quality (lame->lgf, 2));
- /* else default */
-
- if (lame->mono)
- CHECK_ERROR (lame_set_mode (lame->lgf, MONO));
-
- /* initialize the lame encoder */
- if ((retval = lame_init_params (lame->lgf)) >= 0) {
- /* FIXME: it would be nice to print out the mode here */
- GST_INFO
- ("lame encoder setup (target %s, quality %f, bitrate %d, %d Hz, %d channels)",
- (lame->target == LAMEMP3ENC_TARGET_QUALITY) ? "quality" : "bitrate",
- lame->quality, lame->bitrate, lame->samplerate, lame->num_channels);
- res = TRUE;
- } else {
- GST_ERROR_OBJECT (lame, "lame_init_params returned %d", retval);
- res = FALSE;
- }
-
- GST_DEBUG_OBJECT (lame, "done with setup");
- return res;
-#undef CHECK_ERROR
-}
-
-gboolean
-gst_lamemp3enc_register (GstPlugin * plugin)
-{
- GST_DEBUG_CATEGORY_INIT (debug, "lamemp3enc", 0, "lame mp3 encoder");
-
- if (!gst_element_register (plugin, "lamemp3enc", GST_RANK_PRIMARY,
- GST_TYPE_LAMEMP3ENC))
- return FALSE;
-
- return TRUE;
-}
diff --git a/ext/lame/gstlamemp3enc.h b/ext/lame/gstlamemp3enc.h
deleted file mode 100644
index 25dbc46..0000000
--- a/ext/lame/gstlamemp3enc.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/* GStreamer
- * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu>
- * Copyright (C) <2009> Sebastian Dröge <sebastian.droege@collabora.co.uk>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-
-#ifndef __GST_LAMEMP3ENC_H__
-#define __GST_LAMEMP3ENC_H__
-
-
-#include <gst/gst.h>
-#include <gst/audio/gstaudioencoder.h>
-#include <gst/base/gstadapter.h>
-
-G_BEGIN_DECLS
-
-#include <lame/lame.h>
-
-#define GST_TYPE_LAMEMP3ENC \
- (gst_lamemp3enc_get_type())
-#define GST_LAMEMP3ENC(obj) \
- (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_LAMEMP3ENC,GstLameMP3Enc))
-#define GST_LAMEMP3ENC_CLASS(klass) \
- (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_LAMEMP3ENC,GstLameMP3EncClass))
-#define GST_IS_LAMEMP3ENC(obj) \
- (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_LAMEMP3ENC))
-#define GST_IS_LAMEMP3ENC_CLASS(klass) \
- (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_LAMEMP3ENC))
-
-typedef struct _GstLameMP3Enc GstLameMP3Enc;
-typedef struct _GstLameMP3EncClass GstLameMP3EncClass;
-
-/**
- * GstLameMP3Enc:
- *
- * Opaque data structure.
- */
-struct _GstLameMP3Enc {
- GstAudioEncoder element;
-
- /*< private >*/
- gint samplerate;
- gint out_samplerate;
- gint num_channels;
-
- /* properties */
- gint target;
- gint bitrate;
- gboolean cbr;
- gfloat quality;
- gint encoding_engine_quality;
- gboolean mono;
-
- lame_global_flags *lgf;
-
- GstAdapter *adapter;
-};
-
-struct _GstLameMP3EncClass {
- GstAudioEncoderClass parent_class;
-};
-
-GType gst_lamemp3enc_get_type(void);
-gboolean gst_lamemp3enc_register (GstPlugin * plugin);
-
-G_END_DECLS
-
-#endif /* __GST_LAMEMP3ENC_H__ */
diff --git a/ext/lame/meson.build b/ext/lame/meson.build
deleted file mode 100644
index 2812cb9..0000000
--- a/ext/lame/meson.build
+++ /dev/null
@@ -1,19 +0,0 @@
-lame_dep = cc.find_library('mp3lame', required : false)
-
-if lame_dep.found() and cc.has_header_symbol('lame/lame.h', 'lame_init')
- lame_extra_c_args = []
- if cc.has_header_symbol('lame/lame.h', 'lame_set_VBR_quality')
- lame_extra_c_args += ['-DHAVE_LAME_SET_VBR_QUALITY']
- endif
- if cc.has_header_symbol('lame/lame.h', 'MEDIUM')
- lame_extra_c_args += ['-DGSTLAME_PRESET']
- endif
- lame = library('gstlame',
- ['gstlamemp3enc.c', 'plugin.c'],
- c_args : ugly_args + lame_extra_c_args,
- include_directories : [configinc, libsinc],
- dependencies : [gstaudio_dep, lame_dep],
- install : true,
- install_dir : plugins_install_dir,
- )
-endif
diff --git a/ext/lame/plugin.c b/ext/lame/plugin.c
deleted file mode 100644
index 6aae21e..0000000
--- a/ext/lame/plugin.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/* GStreamer
- * Copyright (C) <2009> Sebastian Dröge <sebastian.droege@collabora.co.uk>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <gst/gst.h>
-#include <gst/gst-i18n-plugin.h>
-
-#include "gstlamemp3enc.h"
-
-static gboolean
-plugin_init (GstPlugin * plugin)
-{
-#ifdef ENABLE_NLS
- bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
- bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
-#endif /* ENABLE_NLS */
-
- return gst_lamemp3enc_register (plugin);
-}
-
-GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
- GST_VERSION_MINOR,
- lame,
- "Encode MP3s with LAME",
- plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN);
diff --git a/ext/meson.build b/ext/meson.build
index 6c5a176..c33bb1c 100644
--- a/ext/meson.build
+++ b/ext/meson.build
@@ -3,9 +3,6 @@
subdir('amrwbdec')
subdir('cdio')
subdir('dvdread')
-subdir('lame')
subdir('mpeg2dec')
-subdir('mpg123')
-#subdir('sidplay') # FIXME
-subdir('twolame')
+subdir('sidplay')
subdir('x264')
diff --git a/ext/mpeg2dec/Makefile.am b/ext/mpeg2dec/Makefile.am
index 593e2c3..892bf59 100644
--- a/ext/mpeg2dec/Makefile.am
+++ b/ext/mpeg2dec/Makefile.am
@@ -6,6 +6,5 @@
libgstmpeg2dec_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_API_VERSION) \
$(GST_LIBS) $(MPEG2DEC_LIBS)
libgstmpeg2dec_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstmpeg2dec_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
noinst_HEADERS = gstmpeg2dec.h
diff --git a/ext/mpeg2dec/Makefile.in b/ext/mpeg2dec/Makefile.in
index b6361c2..3cceef2 100644
--- a/ext/mpeg2dec/Makefile.in
+++ b/ext/mpeg2dec/Makefile.in
@@ -170,8 +170,8 @@
am__v_lt_0 = --silent
am__v_lt_1 =
libgstmpeg2dec_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
- $(libgstmpeg2dec_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
- $(CCLD) $(libgstmpeg2dec_la_CFLAGS) $(CFLAGS) \
+ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+ $(libgstmpeg2dec_la_CFLAGS) $(CFLAGS) \
$(libgstmpeg2dec_la_LDFLAGS) $(LDFLAGS) -o $@
AM_V_P = $(am__v_P_@AM_V@)
am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
@@ -284,6 +284,7 @@
ERROR_CFLAGS = @ERROR_CFLAGS@
ERROR_CXXFLAGS = @ERROR_CXXFLAGS@
EXEEXT = @EXEEXT@
+EXTRA_CFLAGS = @EXTRA_CFLAGS@
FFLAGS = @FFLAGS@
FGREP = @FGREP@
GCOV = @GCOV@
@@ -335,7 +336,6 @@
GST_PLUGINS_NONPORTED = @GST_PLUGINS_NONPORTED@
GST_PLUGINS_SELECTED = @GST_PLUGINS_SELECTED@
GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
-GST_PLUGIN_LIBTOOLFLAGS = @GST_PLUGIN_LIBTOOLFLAGS@
GST_PREFIX = @GST_PREFIX@
GST_REVISION = @GST_REVISION@
GST_TOOLS_DIR = @GST_TOOLS_DIR@
@@ -346,7 +346,6 @@
GTKDOC_REBASE = @GTKDOC_REBASE@
HAVE_CXX = @HAVE_CXX@
HAVE_DVDREAD = @HAVE_DVDREAD@
-HAVE_LAME = @HAVE_LAME@
HTML_DIR = @HTML_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
@@ -355,8 +354,6 @@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INTLLIBS = @INTLLIBS@
INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-LAME_CFLAGS = @LAME_CFLAGS@
-LAME_LIBS = @LAME_LIBS@
LD = @LD@
LDFLAGS = @LDFLAGS@
LIBICONV = @LIBICONV@
@@ -378,8 +375,6 @@
MKDIR_P = @MKDIR_P@
MPEG2DEC_CFLAGS = @MPEG2DEC_CFLAGS@
MPEG2DEC_LIBS = @MPEG2DEC_LIBS@
-MPG123_CFLAGS = @MPG123_CFLAGS@
-MPG123_LIBS = @MPG123_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_015 = @MSGFMT_015@
MSGMERGE = @MSGMERGE@
@@ -422,13 +417,13 @@
SIDPLAY_CFLAGS = @SIDPLAY_CFLAGS@
SIDPLAY_LIBS = @SIDPLAY_LIBS@
STRIP = @STRIP@
-TWOLAME_CFLAGS = @TWOLAME_CFLAGS@
-TWOLAME_LIBS = @TWOLAME_LIBS@
USE_NLS = @USE_NLS@
VALGRIND_CFLAGS = @VALGRIND_CFLAGS@
VALGRIND_LIBS = @VALGRIND_LIBS@
VALGRIND_PATH = @VALGRIND_PATH@
VERSION = @VERSION@
+VISIBILITY_CFLAGS = @VISIBILITY_CFLAGS@
+VISIBILITY_CXXFLAGS = @VISIBILITY_CXXFLAGS@
WARNING_CFLAGS = @WARNING_CFLAGS@
WARNING_CXXFLAGS = @WARNING_CXXFLAGS@
WIN32_LIBS = @WIN32_LIBS@
@@ -509,7 +504,6 @@
$(GST_LIBS) $(MPEG2DEC_LIBS)
libgstmpeg2dec_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstmpeg2dec_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
noinst_HEADERS = gstmpeg2dec.h
all: all-am
@@ -616,11 +610,11 @@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
libgstmpeg2dec_la-gstmpeg2dec.lo: gstmpeg2dec.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstmpeg2dec_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstmpeg2dec_la_CFLAGS) $(CFLAGS) -MT libgstmpeg2dec_la-gstmpeg2dec.lo -MD -MP -MF $(DEPDIR)/libgstmpeg2dec_la-gstmpeg2dec.Tpo -c -o libgstmpeg2dec_la-gstmpeg2dec.lo `test -f 'gstmpeg2dec.c' || echo '$(srcdir)/'`gstmpeg2dec.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstmpeg2dec_la_CFLAGS) $(CFLAGS) -MT libgstmpeg2dec_la-gstmpeg2dec.lo -MD -MP -MF $(DEPDIR)/libgstmpeg2dec_la-gstmpeg2dec.Tpo -c -o libgstmpeg2dec_la-gstmpeg2dec.lo `test -f 'gstmpeg2dec.c' || echo '$(srcdir)/'`gstmpeg2dec.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstmpeg2dec_la-gstmpeg2dec.Tpo $(DEPDIR)/libgstmpeg2dec_la-gstmpeg2dec.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gstmpeg2dec.c' object='libgstmpeg2dec_la-gstmpeg2dec.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstmpeg2dec_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstmpeg2dec_la_CFLAGS) $(CFLAGS) -c -o libgstmpeg2dec_la-gstmpeg2dec.lo `test -f 'gstmpeg2dec.c' || echo '$(srcdir)/'`gstmpeg2dec.c
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstmpeg2dec_la_CFLAGS) $(CFLAGS) -c -o libgstmpeg2dec_la-gstmpeg2dec.lo `test -f 'gstmpeg2dec.c' || echo '$(srcdir)/'`gstmpeg2dec.c
mostlyclean-libtool:
-rm -f *.lo
diff --git a/ext/mpg123/Makefile.am b/ext/mpg123/Makefile.am
deleted file mode 100644
index 6c96207..0000000
--- a/ext/mpg123/Makefile.am
+++ /dev/null
@@ -1,12 +0,0 @@
-plugin_LTLIBRARIES = libgstmpg123.la
-
-libgstmpg123_la_SOURCES = gstmpg123audiodec.c
-libgstmpg123_la_CFLAGS = -DGST_USE_UNSTABLE_API \
- $(GST_PLUGINS_BASE_CFLAGS) \
- $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(MPG123_CFLAGS)
-libgstmpg123_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-@GST_API_VERSION@ \
- $(GST_BASE_LIBS) $(GST_LIBS) $(MPG123_LIBS)
-libgstmpg123_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstmpg123_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
-
-noinst_HEADERS = gstmpg123audiodec.h
diff --git a/ext/mpg123/Makefile.in b/ext/mpg123/Makefile.in
deleted file mode 100644
index 5e965ba..0000000
--- a/ext/mpg123/Makefile.in
+++ /dev/null
@@ -1,845 +0,0 @@
-# Makefile.in generated by automake 1.15.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994-2017 Free Software Foundation, Inc.
-
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-
-VPATH = @srcdir@
-am__is_gnu_make = { \
- if test -z '$(MAKELEVEL)'; then \
- false; \
- elif test -n '$(MAKE_HOST)'; then \
- true; \
- elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
- true; \
- else \
- false; \
- fi; \
-}
-am__make_running_with_option = \
- case $${target_option-} in \
- ?) ;; \
- *) echo "am__make_running_with_option: internal error: invalid" \
- "target option '$${target_option-}' specified" >&2; \
- exit 1;; \
- esac; \
- has_opt=no; \
- sane_makeflags=$$MAKEFLAGS; \
- if $(am__is_gnu_make); then \
- sane_makeflags=$$MFLAGS; \
- else \
- case $$MAKEFLAGS in \
- *\\[\ \ ]*) \
- bs=\\; \
- sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
- | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
- esac; \
- fi; \
- skip_next=no; \
- strip_trailopt () \
- { \
- flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
- }; \
- for flg in $$sane_makeflags; do \
- test $$skip_next = yes && { skip_next=no; continue; }; \
- case $$flg in \
- *=*|--*) continue;; \
- -*I) strip_trailopt 'I'; skip_next=yes;; \
- -*I?*) strip_trailopt 'I';; \
- -*O) strip_trailopt 'O'; skip_next=yes;; \
- -*O?*) strip_trailopt 'O';; \
- -*l) strip_trailopt 'l'; skip_next=yes;; \
- -*l?*) strip_trailopt 'l';; \
- -[dEDm]) skip_next=yes;; \
- -[JT]) skip_next=yes;; \
- esac; \
- case $$flg in \
- *$$target_option*) has_opt=yes; break;; \
- esac; \
- done; \
- test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-target_triplet = @target@
-subdir = ext/mpg123
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \
- $(top_srcdir)/common/m4/as-auto-alt.m4 \
- $(top_srcdir)/common/m4/as-compiler-flag.m4 \
- $(top_srcdir)/common/m4/as-libtool.m4 \
- $(top_srcdir)/common/m4/as-version.m4 \
- $(top_srcdir)/common/m4/ax_create_stdint_h.m4 \
- $(top_srcdir)/common/m4/gst-arch.m4 \
- $(top_srcdir)/common/m4/gst-args.m4 \
- $(top_srcdir)/common/m4/gst-check.m4 \
- $(top_srcdir)/common/m4/gst-default.m4 \
- $(top_srcdir)/common/m4/gst-dowhile.m4 \
- $(top_srcdir)/common/m4/gst-error.m4 \
- $(top_srcdir)/common/m4/gst-feature.m4 \
- $(top_srcdir)/common/m4/gst-function.m4 \
- $(top_srcdir)/common/m4/gst-gettext.m4 \
- $(top_srcdir)/common/m4/gst-glib2.m4 \
- $(top_srcdir)/common/m4/gst-package-release-datetime.m4 \
- $(top_srcdir)/common/m4/gst-plugin-docs.m4 \
- $(top_srcdir)/common/m4/gst-plugindir.m4 \
- $(top_srcdir)/common/m4/gst.m4 \
- $(top_srcdir)/common/m4/gtk-doc.m4 \
- $(top_srcdir)/common/m4/orc.m4 $(top_srcdir)/common/m4/pkg.m4 \
- $(top_srcdir)/m4/a52.m4 $(top_srcdir)/m4/gettext.m4 \
- $(top_srcdir)/m4/gst-sid.m4 $(top_srcdir)/m4/iconv.m4 \
- $(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/lib-ld.m4 \
- $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
- $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
- $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
- $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
- $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
- $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-DIST_COMMON = $(srcdir)/Makefile.am $(noinst_HEADERS) \
- $(am__DIST_COMMON)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
- *) f=$$p;; \
- esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
- srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
- for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
- for p in $$list; do echo "$$p $$p"; done | \
- sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
- $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
- if (++n[$$2] == $(am__install_max)) \
- { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
- END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
- sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
- sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
- test -z "$$files" \
- || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
- || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
- $(am__cd) "$$dir" && rm -f $$files; }; \
- }
-am__installdirs = "$(DESTDIR)$(plugindir)"
-LTLIBRARIES = $(plugin_LTLIBRARIES)
-am__DEPENDENCIES_1 =
-libgstmpg123_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1)
-am_libgstmpg123_la_OBJECTS = libgstmpg123_la-gstmpg123audiodec.lo
-libgstmpg123_la_OBJECTS = $(am_libgstmpg123_la_OBJECTS)
-AM_V_lt = $(am__v_lt_@AM_V@)
-am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
-am__v_lt_0 = --silent
-am__v_lt_1 =
-libgstmpg123_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
- $(libgstmpg123_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
- $(CCLD) $(libgstmpg123_la_CFLAGS) $(CFLAGS) \
- $(libgstmpg123_la_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo " GEN " $@;
-am__v_GEN_1 =
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-am__v_at_1 =
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CFLAGS) $(CFLAGS)
-AM_V_CC = $(am__v_CC_@AM_V@)
-am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
-am__v_CC_0 = @echo " CC " $@;
-am__v_CC_1 =
-CCLD = $(CC)
-LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CCLD = $(am__v_CCLD_@AM_V@)
-am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
-am__v_CCLD_0 = @echo " CCLD " $@;
-am__v_CCLD_1 =
-SOURCES = $(libgstmpg123_la_SOURCES)
-DIST_SOURCES = $(libgstmpg123_la_SOURCES)
-am__can_run_installinfo = \
- case $$AM_UPDATE_INFO_DIR in \
- n|no|NO) false;; \
- *) (install-info --version) >/dev/null 2>&1;; \
- esac
-HEADERS = $(noinst_HEADERS)
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-# Read a list of newline-separated strings from the standard input,
-# and print each of them once, without duplicates. Input order is
-# *not* preserved.
-am__uniquify_input = $(AWK) '\
- BEGIN { nonempty = 0; } \
- { items[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in items) print i; }; } \
-'
-# Make sure the list of sources is unique. This is necessary because,
-# e.g., the same source file might be shared among _SOURCES variables
-# for different programs/libraries.
-am__define_uniq_tagged_files = \
- list='$(am__tagged_files)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | $(am__uniquify_input)`
-ETAGS = etags
-CTAGS = ctags
-am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-A52DEC_CFLAGS = @A52DEC_CFLAGS@
-A52DEC_LIBS = @A52DEC_LIBS@
-ACLOCAL = @ACLOCAL@
-ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
-AMRNB_CFLAGS = @AMRNB_CFLAGS@
-AMRNB_LIBS = @AMRNB_LIBS@
-AMRWB_CFLAGS = @AMRWB_CFLAGS@
-AMRWB_LIBS = @AMRWB_LIBS@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AR = @AR@
-AS = @AS@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCASFLAGS = @CCASFLAGS@
-CCDEPMODE = @CCDEPMODE@
-CDIO_CFLAGS = @CDIO_CFLAGS@
-CDIO_LIBS = @CDIO_LIBS@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFAULT_AUDIOSINK = @DEFAULT_AUDIOSINK@
-DEFAULT_AUDIOSRC = @DEFAULT_AUDIOSRC@
-DEFAULT_VIDEOSINK = @DEFAULT_VIDEOSINK@
-DEFAULT_VIDEOSRC = @DEFAULT_VIDEOSRC@
-DEFAULT_VISUALIZER = @DEFAULT_VISUALIZER@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DEPRECATED_CFLAGS = @DEPRECATED_CFLAGS@
-DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-DVDREAD_LIBS = @DVDREAD_LIBS@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-ERROR_CFLAGS = @ERROR_CFLAGS@
-ERROR_CXXFLAGS = @ERROR_CXXFLAGS@
-EXEEXT = @EXEEXT@
-FFLAGS = @FFLAGS@
-FGREP = @FGREP@
-GCOV = @GCOV@
-GCOV_CFLAGS = @GCOV_CFLAGS@
-GCOV_LIBS = @GCOV_LIBS@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GIO_CFLAGS = @GIO_CFLAGS@
-GIO_LDFLAGS = @GIO_LDFLAGS@
-GIO_LIBS = @GIO_LIBS@
-GLIB_CFLAGS = @GLIB_CFLAGS@
-GLIB_EXTRA_CFLAGS = @GLIB_EXTRA_CFLAGS@
-GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
-GLIB_LIBS = @GLIB_LIBS@
-GLIB_MKENUMS = @GLIB_MKENUMS@
-GLIB_PREFIX = @GLIB_PREFIX@
-GLIB_REQ = @GLIB_REQ@
-GMODULE_NO_EXPORT_CFLAGS = @GMODULE_NO_EXPORT_CFLAGS@
-GMODULE_NO_EXPORT_LIBS = @GMODULE_NO_EXPORT_LIBS@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
-GREP = @GREP@
-GSTPB_PLUGINS_DIR = @GSTPB_PLUGINS_DIR@
-GSTPB_PREFIX = @GSTPB_PREFIX@
-GST_AGE = @GST_AGE@
-GST_ALL_LDFLAGS = @GST_ALL_LDFLAGS@
-GST_API_VERSION = @GST_API_VERSION@
-GST_BASE_CFLAGS = @GST_BASE_CFLAGS@
-GST_BASE_LIBS = @GST_BASE_LIBS@
-GST_CFLAGS = @GST_CFLAGS@
-GST_CHECK_CFLAGS = @GST_CHECK_CFLAGS@
-GST_CHECK_LIBS = @GST_CHECK_LIBS@
-GST_CURRENT = @GST_CURRENT@
-GST_CXXFLAGS = @GST_CXXFLAGS@
-GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@
-GST_LIBS = @GST_LIBS@
-GST_LIBVERSION = @GST_LIBVERSION@
-GST_LICENSE = @GST_LICENSE@
-GST_LT_LDFLAGS = @GST_LT_LDFLAGS@
-GST_OPTION_CFLAGS = @GST_OPTION_CFLAGS@
-GST_OPTION_CXXFLAGS = @GST_OPTION_CXXFLAGS@
-GST_PACKAGE_NAME = @GST_PACKAGE_NAME@
-GST_PACKAGE_ORIGIN = @GST_PACKAGE_ORIGIN@
-GST_PLUGINS_ALL = @GST_PLUGINS_ALL@
-GST_PLUGINS_BASE_CFLAGS = @GST_PLUGINS_BASE_CFLAGS@
-GST_PLUGINS_BASE_DIR = @GST_PLUGINS_BASE_DIR@
-GST_PLUGINS_BASE_LIBS = @GST_PLUGINS_BASE_LIBS@
-GST_PLUGINS_DIR = @GST_PLUGINS_DIR@
-GST_PLUGINS_NONPORTED = @GST_PLUGINS_NONPORTED@
-GST_PLUGINS_SELECTED = @GST_PLUGINS_SELECTED@
-GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
-GST_PLUGIN_LIBTOOLFLAGS = @GST_PLUGIN_LIBTOOLFLAGS@
-GST_PREFIX = @GST_PREFIX@
-GST_REVISION = @GST_REVISION@
-GST_TOOLS_DIR = @GST_TOOLS_DIR@
-GTKDOC_CHECK = @GTKDOC_CHECK@
-GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
-GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
-GTKDOC_MKPDF = @GTKDOC_MKPDF@
-GTKDOC_REBASE = @GTKDOC_REBASE@
-HAVE_CXX = @HAVE_CXX@
-HAVE_DVDREAD = @HAVE_DVDREAD@
-HAVE_LAME = @HAVE_LAME@
-HTML_DIR = @HTML_DIR@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-LAME_CFLAGS = @LAME_CFLAGS@
-LAME_LIBS = @LAME_LIBS@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBM = @LIBM@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LOCALEDIR = @LOCALEDIR@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-LTLIBOBJS = @LTLIBOBJS@
-LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MKDIR_P = @MKDIR_P@
-MPEG2DEC_CFLAGS = @MPEG2DEC_CFLAGS@
-MPEG2DEC_LIBS = @MPEG2DEC_LIBS@
-MPG123_CFLAGS = @MPG123_CFLAGS@
-MPG123_LIBS = @MPG123_LIBS@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-ORCC = @ORCC@
-ORCC_FLAGS = @ORCC_FLAGS@
-ORC_CFLAGS = @ORC_CFLAGS@
-ORC_LIBS = @ORC_LIBS@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PACKAGE_VERSION_MAJOR = @PACKAGE_VERSION_MAJOR@
-PACKAGE_VERSION_MICRO = @PACKAGE_VERSION_MICRO@
-PACKAGE_VERSION_MINOR = @PACKAGE_VERSION_MINOR@
-PACKAGE_VERSION_NANO = @PACKAGE_VERSION_NANO@
-PACKAGE_VERSION_RELEASE = @PACKAGE_VERSION_RELEASE@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PLUGINDIR = @PLUGINDIR@
-POSUB = @POSUB@
-PROFILE_CFLAGS = @PROFILE_CFLAGS@
-PYTHON = @PYTHON@
-PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
-PYTHON_PLATFORM = @PYTHON_PLATFORM@
-PYTHON_PREFIX = @PYTHON_PREFIX@
-PYTHON_VERSION = @PYTHON_VERSION@
-RANLIB = @RANLIB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SIDPLAY_CFLAGS = @SIDPLAY_CFLAGS@
-SIDPLAY_LIBS = @SIDPLAY_LIBS@
-STRIP = @STRIP@
-TWOLAME_CFLAGS = @TWOLAME_CFLAGS@
-TWOLAME_LIBS = @TWOLAME_LIBS@
-USE_NLS = @USE_NLS@
-VALGRIND_CFLAGS = @VALGRIND_CFLAGS@
-VALGRIND_LIBS = @VALGRIND_LIBS@
-VALGRIND_PATH = @VALGRIND_PATH@
-VERSION = @VERSION@
-WARNING_CFLAGS = @WARNING_CFLAGS@
-WARNING_CXXFLAGS = @WARNING_CXXFLAGS@
-WIN32_LIBS = @WIN32_LIBS@
-X264_CFLAGS = @X264_CFLAGS@
-X264_LIBS = @X264_LIBS@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-pkgpyexecdir = @pkgpyexecdir@
-pkgpythondir = @pkgpythondir@
-plugindir = @plugindir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-pyexecdir = @pyexecdir@
-pythondir = @pythondir@
-runstatedir = @runstatedir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target = @target@
-target_alias = @target_alias@
-target_cpu = @target_cpu@
-target_os = @target_os@
-target_vendor = @target_vendor@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-plugin_LTLIBRARIES = libgstmpg123.la
-libgstmpg123_la_SOURCES = gstmpg123audiodec.c
-libgstmpg123_la_CFLAGS = -DGST_USE_UNSTABLE_API \
- $(GST_PLUGINS_BASE_CFLAGS) \
- $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(MPG123_CFLAGS)
-
-libgstmpg123_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-@GST_API_VERSION@ \
- $(GST_BASE_LIBS) $(GST_LIBS) $(MPG123_LIBS)
-
-libgstmpg123_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstmpg123_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
-noinst_HEADERS = gstmpg123audiodec.h
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
- && { if test -f $@; then exit 0; else break; fi; }; \
- exit 1;; \
- esac; \
- done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu ext/mpg123/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu ext/mpg123/Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- @case '$?' in \
- *config.status*) \
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
- *) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
- esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
- @$(NORMAL_INSTALL)
- @list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \
- list2=; for p in $$list; do \
- if test -f $$p; then \
- list2="$$list2 $$p"; \
- else :; fi; \
- done; \
- test -z "$$list2" || { \
- echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
- $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \
- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \
- }
-
-uninstall-pluginLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
- @list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \
- for p in $$list; do \
- $(am__strip_dir) \
- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$f'"; \
- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$f"; \
- done
-
-clean-pluginLTLIBRARIES:
- -test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES)
- @list='$(plugin_LTLIBRARIES)'; \
- locs=`for p in $$list; do echo $$p; done | \
- sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
- sort -u`; \
- test -z "$$locs" || { \
- echo rm -f $${locs}; \
- rm -f $${locs}; \
- }
-
-libgstmpg123.la: $(libgstmpg123_la_OBJECTS) $(libgstmpg123_la_DEPENDENCIES) $(EXTRA_libgstmpg123_la_DEPENDENCIES)
- $(AM_V_CCLD)$(libgstmpg123_la_LINK) -rpath $(plugindir) $(libgstmpg123_la_OBJECTS) $(libgstmpg123_la_LIBADD) $(LIBS)
-
-mostlyclean-compile:
- -rm -f *.$(OBJEXT)
-
-distclean-compile:
- -rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstmpg123_la-gstmpg123audiodec.Plo@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
-
-.c.obj:
-@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
-@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
-@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
-
-libgstmpg123_la-gstmpg123audiodec.lo: gstmpg123audiodec.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstmpg123_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstmpg123_la_CFLAGS) $(CFLAGS) -MT libgstmpg123_la-gstmpg123audiodec.lo -MD -MP -MF $(DEPDIR)/libgstmpg123_la-gstmpg123audiodec.Tpo -c -o libgstmpg123_la-gstmpg123audiodec.lo `test -f 'gstmpg123audiodec.c' || echo '$(srcdir)/'`gstmpg123audiodec.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstmpg123_la-gstmpg123audiodec.Tpo $(DEPDIR)/libgstmpg123_la-gstmpg123audiodec.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gstmpg123audiodec.c' object='libgstmpg123_la-gstmpg123audiodec.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstmpg123_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstmpg123_la_CFLAGS) $(CFLAGS) -c -o libgstmpg123_la-gstmpg123audiodec.lo `test -f 'gstmpg123audiodec.c' || echo '$(srcdir)/'`gstmpg123audiodec.c
-
-mostlyclean-libtool:
- -rm -f *.lo
-
-clean-libtool:
- -rm -rf .libs _libs
-
-ID: $(am__tagged_files)
- $(am__define_uniq_tagged_files); mkid -fID $$unique
-tags: tags-am
-TAGS: tags
-
-tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
- set x; \
- here=`pwd`; \
- $(am__define_uniq_tagged_files); \
- shift; \
- if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- if test $$# -gt 0; then \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- "$$@" $$unique; \
- else \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$unique; \
- fi; \
- fi
-ctags: ctags-am
-
-CTAGS: ctags
-ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
- $(am__define_uniq_tagged_files); \
- test -z "$(CTAGS_ARGS)$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$unique
-
-GTAGS:
- here=`$(am__cd) $(top_builddir) && pwd` \
- && $(am__cd) $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) "$$here"
-cscopelist: cscopelist-am
-
-cscopelist-am: $(am__tagged_files)
- list='$(am__tagged_files)'; \
- case "$(srcdir)" in \
- [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
- *) sdir=$(subdir)/$(srcdir) ;; \
- esac; \
- for i in $$list; do \
- if test -f "$$i"; then \
- echo "$(subdir)/$$i"; \
- else \
- echo "$$sdir/$$i"; \
- fi; \
- done >> $(top_builddir)/cscope.files
-
-distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
- list='$(DISTFILES)'; \
- dist_files=`for file in $$list; do echo $$file; done | \
- sed -e "s|^$$srcdirstrip/||;t" \
- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
- case $$dist_files in \
- */*) $(MKDIR_P) `echo "$$dist_files" | \
- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
- sort -u` ;; \
- esac; \
- for file in $$dist_files; do \
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- if test -d $$d/$$file; then \
- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test -d "$(distdir)/$$file"; then \
- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
- fi; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
- fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
- else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
- || exit 1; \
- fi; \
- done
-check-am: all-am
-check: check-am
-all-am: Makefile $(LTLIBRARIES) $(HEADERS)
-installdirs:
- for dir in "$(DESTDIR)$(plugindir)"; do \
- test -z "$$dir" || $(MKDIR_P) "$$dir"; \
- done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
- if test -z '$(STRIP)'; then \
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- install; \
- else \
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
- fi
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
- -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
- @echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool clean-pluginLTLIBRARIES \
- mostlyclean-am
-
-distclean: distclean-am
- -rm -rf ./$(DEPDIR)
- -rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
- distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-pluginLTLIBRARIES
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
- -rm -rf ./$(DEPDIR)
- -rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
- mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-pluginLTLIBRARIES
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
- clean-libtool clean-pluginLTLIBRARIES cscopelist-am ctags \
- ctags-am distclean distclean-compile distclean-generic \
- distclean-libtool distclean-tags distdir dvi dvi-am html \
- html-am info info-am install install-am install-data \
- install-data-am install-dvi install-dvi-am install-exec \
- install-exec-am install-html install-html-am install-info \
- install-info-am install-man install-pdf install-pdf-am \
- install-pluginLTLIBRARIES install-ps install-ps-am \
- install-strip installcheck installcheck-am installdirs \
- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
- pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
- uninstall-pluginLTLIBRARIES
-
-.PRECIOUS: Makefile
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/ext/mpg123/gstmpg123audiodec.c b/ext/mpg123/gstmpg123audiodec.c
deleted file mode 100644
index fa6743c..0000000
--- a/ext/mpg123/gstmpg123audiodec.c
+++ /dev/null
@@ -1,634 +0,0 @@
-/* MP3 decoding plugin for GStreamer using the mpg123 library
- * Copyright (C) 2012 Carlos Rafael Giani
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-/**
- * SECTION: element-mpg123audiodec
- * @see_also: lamemp3enc, mad
- *
- * Audio decoder for MPEG-1 layer 1/2/3 audio data.
- *
- * <refsect2>
- * <title>Example pipelines</title>
- * |[
- * gst-launch-1.0 filesrc location=music.mp3 ! mpegaudioparse ! mpg123audiodec ! audioconvert ! audioresample ! autoaudiosink
- * ]| Decode and play the mp3 file
- * </refsect2>
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include "gstmpg123audiodec.h"
-
-#include <stdlib.h>
-#include <string.h>
-
-GST_DEBUG_CATEGORY_STATIC (mpg123_debug);
-#define GST_CAT_DEFAULT mpg123_debug
-
-/* Omitted sample formats that mpg123 supports (or at least can support):
- * - 8bit integer signed
- * - 8bit integer unsigned
- * - a-law
- * - mu-law
- * - 64bit float
- *
- * The first four formats are not supported by the GstAudioDecoder base class.
- * (The internal gst_audio_format_from_caps_structure() call fails.)
- *
- * The 64bit float issue is tricky. mpg123 actually decodes to "real",
- * not necessarily to "float".
- *
- * "real" can be fixed point, 32bit float, 64bit float. There seems to be
- * no way how to find out which one of them is actually used.
- *
- * However, in all known installations, "real" equals 32bit float, so that's
- * what is used. */
-
-static GstStaticPadTemplate static_sink_template =
-GST_STATIC_PAD_TEMPLATE ("sink",
- GST_PAD_SINK,
- GST_PAD_ALWAYS,
- GST_STATIC_CAPS ("audio/mpeg, "
- "mpegversion = (int) 1, "
- "layer = (int) [ 1, 3 ], "
- "rate = (int) { 8000, 11025, 12000, 16000, 22050, 24000, 32000, 44100, 48000 }, "
- "channels = (int) [ 1, 2 ], " "parsed = (boolean) true ")
- );
-
-static gboolean gst_mpg123_audio_dec_start (GstAudioDecoder * dec);
-static gboolean gst_mpg123_audio_dec_stop (GstAudioDecoder * dec);
-static GstFlowReturn gst_mpg123_audio_dec_push_decoded_bytes (GstMpg123AudioDec
- * mpg123_decoder, unsigned char const *decoded_bytes,
- size_t const num_decoded_bytes);
-static GstFlowReturn gst_mpg123_audio_dec_handle_frame (GstAudioDecoder * dec,
- GstBuffer * input_buffer);
-static gboolean gst_mpg123_audio_dec_set_format (GstAudioDecoder * dec,
- GstCaps * input_caps);
-static void gst_mpg123_audio_dec_flush (GstAudioDecoder * dec, gboolean hard);
-
-G_DEFINE_TYPE (GstMpg123AudioDec, gst_mpg123_audio_dec, GST_TYPE_AUDIO_DECODER);
-
-static void
-gst_mpg123_audio_dec_class_init (GstMpg123AudioDecClass * klass)
-{
- GstAudioDecoderClass *base_class;
- GstElementClass *element_class;
- GstPadTemplate *src_template, *sink_template;
- int error;
-
- GST_DEBUG_CATEGORY_INIT (mpg123_debug, "mpg123", 0, "mpg123 mp3 decoder");
-
- base_class = GST_AUDIO_DECODER_CLASS (klass);
- element_class = GST_ELEMENT_CLASS (klass);
-
- gst_element_class_set_static_metadata (element_class,
- "mpg123 mp3 decoder",
- "Codec/Decoder/Audio",
- "Decodes mp3 streams using the mpg123 library",
- "Carlos Rafael Giani <dv@pseudoterminal.org>");
-
- /* Not using static pad template for srccaps, since the comma-separated list
- * of formats needs to be created depending on whatever mpg123 supports */
- {
- const int *format_list;
- const long *rates_list;
- size_t num, i;
- GString *s;
- GstCaps *src_template_caps;
-
- s = g_string_new ("audio/x-raw, ");
-
- mpg123_encodings (&format_list, &num);
- g_string_append (s, "format = { ");
- for (i = 0; i < num; ++i) {
- switch (format_list[i]) {
- case MPG123_ENC_SIGNED_16:
- g_string_append (s, (i > 0) ? ", " : "");
- g_string_append (s, GST_AUDIO_NE (S16));
- break;
- case MPG123_ENC_UNSIGNED_16:
- g_string_append (s, (i > 0) ? ", " : "");
- g_string_append (s, GST_AUDIO_NE (U16));
- break;
- case MPG123_ENC_SIGNED_24:
- g_string_append (s, (i > 0) ? ", " : "");
- g_string_append (s, GST_AUDIO_NE (S24));
- break;
- case MPG123_ENC_UNSIGNED_24:
- g_string_append (s, (i > 0) ? ", " : "");
- g_string_append (s, GST_AUDIO_NE (U24));
- break;
- case MPG123_ENC_SIGNED_32:
- g_string_append (s, (i > 0) ? ", " : "");
- g_string_append (s, GST_AUDIO_NE (S32));
- break;
- case MPG123_ENC_UNSIGNED_32:
- g_string_append (s, (i > 0) ? ", " : "");
- g_string_append (s, GST_AUDIO_NE (U32));
- break;
- case MPG123_ENC_FLOAT_32:
- g_string_append (s, (i > 0) ? ", " : "");
- g_string_append (s, GST_AUDIO_NE (F32));
- break;
- default:
- GST_DEBUG ("Ignoring mpg123 format %d", format_list[i]);
- break;
- }
- }
- g_string_append (s, " }, ");
-
- mpg123_rates (&rates_list, &num);
- g_string_append (s, "rate = (int) { ");
- for (i = 0; i < num; ++i) {
- g_string_append_printf (s, "%s%lu", (i > 0) ? ", " : "", rates_list[i]);
- }
- g_string_append (s, "}, ");
-
- g_string_append (s, "channels = (int) [ 1, 2 ], ");
- g_string_append (s, "layout = (string) interleaved");
-
- src_template_caps = gst_caps_from_string (s->str);
- src_template = gst_pad_template_new ("src", GST_PAD_SRC, GST_PAD_ALWAYS,
- src_template_caps);
- gst_caps_unref (src_template_caps);
-
- g_string_free (s, TRUE);
- }
-
- sink_template = gst_static_pad_template_get (&static_sink_template);
-
- gst_element_class_add_pad_template (element_class, sink_template);
- gst_element_class_add_pad_template (element_class, src_template);
-
- base_class->start = GST_DEBUG_FUNCPTR (gst_mpg123_audio_dec_start);
- base_class->stop = GST_DEBUG_FUNCPTR (gst_mpg123_audio_dec_stop);
- base_class->handle_frame =
- GST_DEBUG_FUNCPTR (gst_mpg123_audio_dec_handle_frame);
- base_class->set_format = GST_DEBUG_FUNCPTR (gst_mpg123_audio_dec_set_format);
- base_class->flush = GST_DEBUG_FUNCPTR (gst_mpg123_audio_dec_flush);
-
- error = mpg123_init ();
- if (G_UNLIKELY (error != MPG123_OK))
- GST_ERROR ("Could not initialize mpg123 library: %s",
- mpg123_plain_strerror (error));
- else
- GST_INFO ("mpg123 library initialized");
-}
-
-
-void
-gst_mpg123_audio_dec_init (GstMpg123AudioDec * mpg123_decoder)
-{
- mpg123_decoder->handle = NULL;
- gst_audio_decoder_set_needs_format (GST_AUDIO_DECODER (mpg123_decoder), TRUE);
- gst_audio_decoder_set_use_default_pad_acceptcaps (GST_AUDIO_DECODER_CAST
- (mpg123_decoder), TRUE);
- GST_PAD_SET_ACCEPT_TEMPLATE (GST_AUDIO_DECODER_SINK_PAD (mpg123_decoder));
-}
-
-
-static gboolean
-gst_mpg123_audio_dec_start (GstAudioDecoder * dec)
-{
- GstMpg123AudioDec *mpg123_decoder;
- int error;
-
- mpg123_decoder = GST_MPG123_AUDIO_DEC (dec);
- error = 0;
-
- mpg123_decoder->handle = mpg123_new (NULL, &error);
- mpg123_decoder->has_next_audioinfo = FALSE;
- mpg123_decoder->frame_offset = 0;
-
- /* Initially, the mpg123 handle comes with a set of default formats
- * supported. This clears this set. This is necessary, since only one
- * format shall be supported (see set_format for more). */
- mpg123_format_none (mpg123_decoder->handle);
-
- /* Built-in mpg123 support for gapless decoding is disabled for now,
- * since it does not work well with seeking */
- mpg123_param (mpg123_decoder->handle, MPG123_REMOVE_FLAGS, MPG123_GAPLESS, 0);
- /* Tells mpg123 to use a small read-ahead buffer for better MPEG sync;
- * essential for MP3 radio streams */
- mpg123_param (mpg123_decoder->handle, MPG123_ADD_FLAGS, MPG123_SEEKBUFFER, 0);
- /* Sets the resync limit to the end of the stream (otherwise mpg123 may give
- * up on decoding prematurely, especially with mp3 web radios) */
- mpg123_param (mpg123_decoder->handle, MPG123_RESYNC_LIMIT, -1, 0);
-#if MPG123_API_VERSION >= 36
- /* The precise API version where MPG123_AUTO_RESAMPLE appeared is
- * somewhere between 29 and 36 */
- /* Don't let mpg123 resample output */
- mpg123_param (mpg123_decoder->handle, MPG123_REMOVE_FLAGS,
- MPG123_AUTO_RESAMPLE, 0);
-#endif
- /* Don't let mpg123 print messages to stdout/stderr */
- mpg123_param (mpg123_decoder->handle, MPG123_ADD_FLAGS, MPG123_QUIET, 0);
-
- /* Open in feed mode (= encoded data is fed manually into the handle). */
- error = mpg123_open_feed (mpg123_decoder->handle);
-
- if (G_UNLIKELY (error != MPG123_OK)) {
- GST_ELEMENT_ERROR (dec, LIBRARY, INIT, (NULL),
- ("%s", mpg123_strerror (mpg123_decoder->handle)));
- mpg123_close (mpg123_decoder->handle);
- mpg123_delete (mpg123_decoder->handle);
- mpg123_decoder->handle = NULL;
- return FALSE;
- }
-
- GST_INFO_OBJECT (dec, "mpg123 decoder started");
-
- return TRUE;
-}
-
-
-static gboolean
-gst_mpg123_audio_dec_stop (GstAudioDecoder * dec)
-{
- GstMpg123AudioDec *mpg123_decoder = GST_MPG123_AUDIO_DEC (dec);
-
- if (G_LIKELY (mpg123_decoder->handle != NULL)) {
- mpg123_close (mpg123_decoder->handle);
- mpg123_delete (mpg123_decoder->handle);
- mpg123_decoder->handle = NULL;
- }
-
- GST_INFO_OBJECT (dec, "mpg123 decoder stopped");
-
- return TRUE;
-}
-
-
-static GstFlowReturn
-gst_mpg123_audio_dec_push_decoded_bytes (GstMpg123AudioDec * mpg123_decoder,
- unsigned char const *decoded_bytes, size_t const num_decoded_bytes)
-{
- GstBuffer *output_buffer;
- GstAudioDecoder *dec;
-
- output_buffer = NULL;
- dec = GST_AUDIO_DECODER (mpg123_decoder);
-
- if ((num_decoded_bytes == 0) || (decoded_bytes == NULL)) {
- /* This occurs in the first few frames, which do not carry data; once
- * MPG123_AUDIO_DEC_NEW_FORMAT is received, the empty frames stop occurring */
- GST_DEBUG_OBJECT (mpg123_decoder,
- "cannot decode yet, need more data -> no output buffer to push");
- return GST_FLOW_OK;
- }
-
- output_buffer = gst_buffer_new_allocate (NULL, num_decoded_bytes, NULL);
-
- if (output_buffer == NULL) {
- /* This is necessary to advance playback in time,
- * even when nothing was decoded. */
- return gst_audio_decoder_finish_frame (dec, NULL, 1);
- } else {
- GstMapInfo info;
-
- if (gst_buffer_map (output_buffer, &info, GST_MAP_WRITE)) {
- memcpy (info.data, decoded_bytes, num_decoded_bytes);
- gst_buffer_unmap (output_buffer, &info);
- } else {
- GST_ERROR_OBJECT (mpg123_decoder, "gst_buffer_map() returned NULL");
- gst_buffer_unref (output_buffer);
- output_buffer = NULL;
- }
-
- return gst_audio_decoder_finish_frame (dec, output_buffer, 1);
- }
-}
-
-
-static GstFlowReturn
-gst_mpg123_audio_dec_handle_frame (GstAudioDecoder * dec,
- GstBuffer * input_buffer)
-{
- GstMpg123AudioDec *mpg123_decoder;
- int decode_error;
- unsigned char *decoded_bytes;
- size_t num_decoded_bytes;
- GstFlowReturn retval;
-
- mpg123_decoder = GST_MPG123_AUDIO_DEC (dec);
-
- g_assert (mpg123_decoder->handle != NULL);
-
- /* The actual decoding */
- {
- /* feed input data (if there is any) */
- if (G_LIKELY (input_buffer != NULL)) {
- GstMapInfo info;
-
- if (gst_buffer_map (input_buffer, &info, GST_MAP_READ)) {
- mpg123_feed (mpg123_decoder->handle, info.data, info.size);
- gst_buffer_unmap (input_buffer, &info);
- } else {
- GST_AUDIO_DECODER_ERROR (mpg123_decoder, 1, RESOURCE, READ, (NULL),
- ("gst_memory_map() failed"), retval);
- return retval;
- }
- }
-
- /* Try to decode a frame */
- decoded_bytes = NULL;
- num_decoded_bytes = 0;
- decode_error = mpg123_decode_frame (mpg123_decoder->handle,
- &mpg123_decoder->frame_offset, &decoded_bytes, &num_decoded_bytes);
- }
-
- retval = GST_FLOW_OK;
-
- switch (decode_error) {
- case MPG123_NEW_FORMAT:
- /* As mentioned in gst_mpg123_audio_dec_set_format(), the next audioinfo
- * is not set immediately; instead, the code waits for mpg123 to take
- * note of the new format, and then sets the audioinfo. This fixes glitches
- * with mp3s containing several format headers (for example, first half
- * using 44.1kHz, second half 32 kHz) */
-
- GST_LOG_OBJECT (dec,
- "mpg123 reported a new format -> setting next srccaps");
-
- gst_mpg123_audio_dec_push_decoded_bytes (mpg123_decoder, decoded_bytes,
- num_decoded_bytes);
-
- /* If there is a next audioinfo, use it, then set has_next_audioinfo to
- * FALSE, to make sure gst_audio_decoder_set_output_format() isn't called
- * again until set_format is called by the base class */
- if (mpg123_decoder->has_next_audioinfo) {
- if (!gst_audio_decoder_set_output_format (dec,
- &(mpg123_decoder->next_audioinfo))) {
- GST_WARNING_OBJECT (dec, "Unable to set output format");
- retval = GST_FLOW_NOT_NEGOTIATED;
- }
- mpg123_decoder->has_next_audioinfo = FALSE;
- }
-
- break;
-
- case MPG123_NEED_MORE:
- case MPG123_OK:
- retval = gst_mpg123_audio_dec_push_decoded_bytes (mpg123_decoder,
- decoded_bytes, num_decoded_bytes);
- break;
-
- case MPG123_DONE:
- /* If this happens, then the upstream parser somehow missed the ending
- * of the bitstream */
- GST_LOG_OBJECT (dec, "mpg123 is done decoding");
- gst_mpg123_audio_dec_push_decoded_bytes (mpg123_decoder, decoded_bytes,
- num_decoded_bytes);
- retval = GST_FLOW_EOS;
- break;
-
- default:
- {
- /* Anything else is considered an error */
- int errcode;
- retval = GST_FLOW_ERROR; /* use error by default */
- switch (decode_error) {
- case MPG123_ERR:
- errcode = mpg123_errcode (mpg123_decoder->handle);
- break;
- default:
- errcode = decode_error;
- }
- switch (errcode) {
- case MPG123_BAD_OUTFORMAT:{
- GstCaps *input_caps =
- gst_pad_get_current_caps (GST_AUDIO_DECODER_SINK_PAD (dec));
- GST_ELEMENT_ERROR (dec, STREAM, FORMAT, (NULL),
- ("Output sample format could not be used when trying to decode frame. "
- "This is typically caused when the input caps (often the sample "
- "rate) do not match the actual format of the audio data. "
- "Input caps: %" GST_PTR_FORMAT, input_caps)
- );
- gst_caps_unref (input_caps);
- break;
- }
- default:{
- char const *errmsg = mpg123_plain_strerror (errcode);
- /* GST_AUDIO_DECODER_ERROR sets a new return value according to
- * its estimations */
- GST_AUDIO_DECODER_ERROR (mpg123_decoder, 1, STREAM, DECODE, (NULL),
- ("mpg123 decoding error: %s", errmsg), retval);
- }
- }
- }
- }
-
- return retval;
-}
-
-
-static gboolean
-gst_mpg123_audio_dec_set_format (GstAudioDecoder * dec, GstCaps * input_caps)
-{
- /* "encoding" is the sample format specifier for mpg123 */
- int encoding;
- int sample_rate, num_channels;
- GstAudioFormat format;
- GstMpg123AudioDec *mpg123_decoder;
- gboolean retval = FALSE;
-
- mpg123_decoder = GST_MPG123_AUDIO_DEC (dec);
-
- g_assert (mpg123_decoder->handle != NULL);
-
- mpg123_decoder->has_next_audioinfo = FALSE;
-
- /* Get sample rate and number of channels from input_caps */
- {
- GstStructure *structure;
- gboolean err = FALSE;
-
- /* Only the first structure is used (multiple
- * input caps structures don't make sense */
- structure = gst_caps_get_structure (input_caps, 0);
-
- if (!gst_structure_get_int (structure, "rate", &sample_rate)) {
- err = TRUE;
- GST_ERROR_OBJECT (dec, "Input caps do not have a rate value");
- }
- if (!gst_structure_get_int (structure, "channels", &num_channels)) {
- err = TRUE;
- GST_ERROR_OBJECT (dec, "Input caps do not have a channel value");
- }
-
- if (G_UNLIKELY (err))
- goto done;
- }
-
- /* Get sample format from the allowed src caps */
- {
- GstCaps *allowed_srccaps =
- gst_pad_get_allowed_caps (GST_AUDIO_DECODER_SRC_PAD (dec));
-
- if (allowed_srccaps == NULL) {
- /* srcpad is not linked (yet), so no peer information is available;
- * just use the default sample format (16 bit signed integer) */
- GST_DEBUG_OBJECT (mpg123_decoder,
- "srcpad is not linked (yet) -> using S16 sample format");
- format = GST_AUDIO_FORMAT_S16;
- encoding = MPG123_ENC_SIGNED_16;
- } else if (gst_caps_is_empty (allowed_srccaps)) {
- gst_caps_unref (allowed_srccaps);
- goto done;
- } else {
- gchar const *format_str;
- GValue const *format_value;
-
- /* Look at the sample format values from the first structure */
- GstStructure *structure = gst_caps_get_structure (allowed_srccaps, 0);
- format_value = gst_structure_get_value (structure, "format");
-
- if (format_value == NULL) {
- gst_caps_unref (allowed_srccaps);
- goto done;
- } else if (GST_VALUE_HOLDS_LIST (format_value)) {
- /* if value is a format list, pick the first entry */
- GValue const *fmt_list_value =
- gst_value_list_get_value (format_value, 0);
- format_str = g_value_get_string (fmt_list_value);
- } else if (G_VALUE_HOLDS_STRING (format_value)) {
- /* if value is a string, use it directly */
- format_str = g_value_get_string (format_value);
- } else {
- GST_ERROR_OBJECT (mpg123_decoder, "unexpected type for 'format' field "
- "in caps structure %" GST_PTR_FORMAT, structure);
- gst_caps_unref (allowed_srccaps);
- goto done;
- }
-
- /* get the format value from the string */
- format = gst_audio_format_from_string (format_str);
- gst_caps_unref (allowed_srccaps);
-
- g_assert (format != GST_AUDIO_FORMAT_UNKNOWN);
-
- /* convert format to mpg123 encoding */
- switch (format) {
- case GST_AUDIO_FORMAT_S16:
- encoding = MPG123_ENC_SIGNED_16;
- break;
- case GST_AUDIO_FORMAT_S24:
- encoding = MPG123_ENC_SIGNED_24;
- break;
- case GST_AUDIO_FORMAT_S32:
- encoding = MPG123_ENC_SIGNED_32;
- break;
- case GST_AUDIO_FORMAT_U16:
- encoding = MPG123_ENC_UNSIGNED_16;
- break;
- case GST_AUDIO_FORMAT_U24:
- encoding = MPG123_ENC_UNSIGNED_24;
- break;
- case GST_AUDIO_FORMAT_U32:
- encoding = MPG123_ENC_UNSIGNED_32;
- break;
- case GST_AUDIO_FORMAT_F32:
- encoding = MPG123_ENC_FLOAT_32;
- break;
- default:
- g_assert_not_reached ();
- goto done;
- }
- }
- }
-
- /* Sample rate, number of channels, and sample format are known at this point.
- * Set the audioinfo structure's values and the mpg123 format. */
- {
- int err;
-
- /* clear all existing format settings from the mpg123 instance */
- mpg123_format_none (mpg123_decoder->handle);
- /* set the chosen format */
- err =
- mpg123_format (mpg123_decoder->handle, sample_rate, num_channels,
- encoding);
-
- if (err != MPG123_OK) {
- GST_WARNING_OBJECT (dec,
- "mpg123_format() failed: %s",
- mpg123_strerror (mpg123_decoder->handle));
- } else {
- gst_audio_info_init (&(mpg123_decoder->next_audioinfo));
- gst_audio_info_set_format (&(mpg123_decoder->next_audioinfo), format,
- sample_rate, num_channels, NULL);
- GST_LOG_OBJECT (dec, "The next audio format is: %s, %u Hz, %u channels",
- gst_audio_format_to_string (format), sample_rate, num_channels);
- mpg123_decoder->has_next_audioinfo = TRUE;
-
- retval = TRUE;
- }
- }
-
-done:
- return retval;
-}
-
-
-static void
-gst_mpg123_audio_dec_flush (GstAudioDecoder * dec, gboolean hard)
-{
- int error;
- GstMpg123AudioDec *mpg123_decoder;
-
- GST_LOG_OBJECT (dec, "Flushing decoder");
-
- mpg123_decoder = GST_MPG123_AUDIO_DEC (dec);
-
- g_assert (mpg123_decoder->handle != NULL);
-
- /* Flush by reopening the feed */
- mpg123_close (mpg123_decoder->handle);
- error = mpg123_open_feed (mpg123_decoder->handle);
-
- if (G_UNLIKELY (error != MPG123_OK)) {
- GST_ELEMENT_ERROR (dec, LIBRARY, INIT, (NULL),
- ("Error while reopening mpg123 feed: %s",
- mpg123_plain_strerror (error)));
- mpg123_close (mpg123_decoder->handle);
- mpg123_delete (mpg123_decoder->handle);
- mpg123_decoder->handle = NULL;
- }
-
- if (hard)
- mpg123_decoder->has_next_audioinfo = FALSE;
-
- /* opening/closing feeds do not affect the format defined by the
- * mpg123_format() call that was made in gst_mpg123_audio_dec_set_format(),
- * and since the up/downstream caps are not expected to change here, no
- * mpg123_format() calls are done */
-}
-
-static gboolean
-plugin_init (GstPlugin * plugin)
-{
- return gst_element_register (plugin, "mpg123audiodec",
- GST_RANK_MARGINAL, gst_mpg123_audio_dec_get_type ());
-}
-
-GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
- GST_VERSION_MINOR,
- mpg123, "mp3 decoding based on the mpg123 library",
- plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN)
diff --git a/ext/mpg123/gstmpg123audiodec.h b/ext/mpg123/gstmpg123audiodec.h
deleted file mode 100644
index b865c41..0000000
--- a/ext/mpg123/gstmpg123audiodec.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/* MP3 decoding plugin for GStreamer using the mpg123 library
- * Copyright (C) 2012 Carlos Rafael Giani
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef __GST_MPG123_AUDIO_DEC_H__
-#define __GST_MPG123_AUDIO_DEC_H__
-
-/* This is what the visual studio build in mpg123 does before including the
- * original header file. Without this we get syntax errors in the
- * replace_reader function declarations because it doesn't know ssize_t etc.
- * It doesn't realy matter for us if the ssize_t typedef here is correct. */
-#ifdef _MSC_VER
-#include <tchar.h>
-#include <stdlib.h>
-#include <sys/types.h>
-typedef long ssize_t;
-#include <stdint.h>
-#endif
-
-#include <gst/gst.h>
-#include <gst/audio/gstaudiodecoder.h>
-#include <mpg123.h>
-
-
-G_BEGIN_DECLS
-
-
-typedef struct _GstMpg123AudioDec GstMpg123AudioDec;
-typedef struct _GstMpg123AudioDecClass GstMpg123AudioDecClass;
-
-
-#define GST_TYPE_MPG123_AUDIO_DEC (gst_mpg123_audio_dec_get_type())
-#define GST_MPG123_AUDIO_DEC(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), GST_TYPE_MPG123_AUDIO_DEC,GstMpg123AudioDec))
-#define GST_MPG123_AUDIO_DEC_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), GST_TYPE_MPG123_AUDIO_DEC,GstMpg123AudioDecClass))
-#define GST_IS_MPG123_AUDIO_DEC(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), GST_TYPE_MPG123_AUDIO_DEC))
-#define GST_IS_MPG123_AUDIO_DEC_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), GST_TYPE_MPG123_AUDIO_DEC))
-
-struct _GstMpg123AudioDec
-{
- GstAudioDecoder parent;
-
- mpg123_handle *handle;
-
- GstAudioInfo next_audioinfo;
- gboolean has_next_audioinfo;
-
- off_t frame_offset;
-};
-
-
-struct _GstMpg123AudioDecClass
-{
- GstAudioDecoderClass parent_class;
-};
-
-G_GNUC_INTERNAL GType gst_mpg123_audio_dec_get_type (void);
-
-G_END_DECLS
-
-#endif
diff --git a/ext/mpg123/meson.build b/ext/mpg123/meson.build
deleted file mode 100644
index a575449..0000000
--- a/ext/mpg123/meson.build
+++ /dev/null
@@ -1,16 +0,0 @@
-mpg123_sources = [
- 'gstmpg123audiodec.c',
-]
-
-mpg123_dep = dependency('libmpg123', version : '>= 1.3', required : false)
-
-if mpg123_dep.found()
- gstmpg123 = library('gstmpg123',
- mpg123_sources,
- c_args : ugly_args,
- include_directories : [configinc],
- dependencies : [gstaudio_dep, mpg123_dep],
- install : true,
- install_dir : plugins_install_dir,
- )
-endif
diff --git a/ext/sidplay/Makefile.am b/ext/sidplay/Makefile.am
index d44b227..aab0bd4 100644
--- a/ext/sidplay/Makefile.am
+++ b/ext/sidplay/Makefile.am
@@ -6,6 +6,5 @@
libgstsid_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(GST_LIBS) $(SIDPLAY_LIBS) \
-lgstaudio-$(GST_API_VERSION)
libgstsid_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstsid_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
noinst_HEADERS = gstsiddec.h
diff --git a/ext/sidplay/Makefile.in b/ext/sidplay/Makefile.in
index 69ac8b4..7b4ba71 100644
--- a/ext/sidplay/Makefile.in
+++ b/ext/sidplay/Makefile.in
@@ -170,10 +170,9 @@
am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
am__v_lt_0 = --silent
am__v_lt_1 =
-libgstsid_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
- $(libgstsid_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
- $(CXXLD) $(libgstsid_la_CXXFLAGS) $(CXXFLAGS) \
- $(libgstsid_la_LDFLAGS) $(LDFLAGS) -o $@
+libgstsid_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(libgstsid_la_CXXFLAGS) \
+ $(CXXFLAGS) $(libgstsid_la_LDFLAGS) $(LDFLAGS) -o $@
AM_V_P = $(am__v_P_@AM_V@)
am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
am__v_P_0 = false
@@ -285,6 +284,7 @@
ERROR_CFLAGS = @ERROR_CFLAGS@
ERROR_CXXFLAGS = @ERROR_CXXFLAGS@
EXEEXT = @EXEEXT@
+EXTRA_CFLAGS = @EXTRA_CFLAGS@
FFLAGS = @FFLAGS@
FGREP = @FGREP@
GCOV = @GCOV@
@@ -336,7 +336,6 @@
GST_PLUGINS_NONPORTED = @GST_PLUGINS_NONPORTED@
GST_PLUGINS_SELECTED = @GST_PLUGINS_SELECTED@
GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
-GST_PLUGIN_LIBTOOLFLAGS = @GST_PLUGIN_LIBTOOLFLAGS@
GST_PREFIX = @GST_PREFIX@
GST_REVISION = @GST_REVISION@
GST_TOOLS_DIR = @GST_TOOLS_DIR@
@@ -347,7 +346,6 @@
GTKDOC_REBASE = @GTKDOC_REBASE@
HAVE_CXX = @HAVE_CXX@
HAVE_DVDREAD = @HAVE_DVDREAD@
-HAVE_LAME = @HAVE_LAME@
HTML_DIR = @HTML_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
@@ -356,8 +354,6 @@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INTLLIBS = @INTLLIBS@
INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-LAME_CFLAGS = @LAME_CFLAGS@
-LAME_LIBS = @LAME_LIBS@
LD = @LD@
LDFLAGS = @LDFLAGS@
LIBICONV = @LIBICONV@
@@ -379,8 +375,6 @@
MKDIR_P = @MKDIR_P@
MPEG2DEC_CFLAGS = @MPEG2DEC_CFLAGS@
MPEG2DEC_LIBS = @MPEG2DEC_LIBS@
-MPG123_CFLAGS = @MPG123_CFLAGS@
-MPG123_LIBS = @MPG123_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_015 = @MSGFMT_015@
MSGMERGE = @MSGMERGE@
@@ -423,13 +417,13 @@
SIDPLAY_CFLAGS = @SIDPLAY_CFLAGS@
SIDPLAY_LIBS = @SIDPLAY_LIBS@
STRIP = @STRIP@
-TWOLAME_CFLAGS = @TWOLAME_CFLAGS@
-TWOLAME_LIBS = @TWOLAME_LIBS@
USE_NLS = @USE_NLS@
VALGRIND_CFLAGS = @VALGRIND_CFLAGS@
VALGRIND_LIBS = @VALGRIND_LIBS@
VALGRIND_PATH = @VALGRIND_PATH@
VERSION = @VERSION@
+VISIBILITY_CFLAGS = @VISIBILITY_CFLAGS@
+VISIBILITY_CXXFLAGS = @VISIBILITY_CXXFLAGS@
WARNING_CFLAGS = @WARNING_CFLAGS@
WARNING_CXXFLAGS = @WARNING_CXXFLAGS@
WIN32_LIBS = @WIN32_LIBS@
@@ -510,7 +504,6 @@
-lgstaudio-$(GST_API_VERSION)
libgstsid_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstsid_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
noinst_HEADERS = gstsiddec.h
all: all-am
@@ -617,11 +610,11 @@
@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
libgstsid_la-gstsiddec.lo: gstsiddec.cc
-@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(libgstsid_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstsid_la_CXXFLAGS) $(CXXFLAGS) -MT libgstsid_la-gstsiddec.lo -MD -MP -MF $(DEPDIR)/libgstsid_la-gstsiddec.Tpo -c -o libgstsid_la-gstsiddec.lo `test -f 'gstsiddec.cc' || echo '$(srcdir)/'`gstsiddec.cc
+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstsid_la_CXXFLAGS) $(CXXFLAGS) -MT libgstsid_la-gstsiddec.lo -MD -MP -MF $(DEPDIR)/libgstsid_la-gstsiddec.Tpo -c -o libgstsid_la-gstsiddec.lo `test -f 'gstsiddec.cc' || echo '$(srcdir)/'`gstsiddec.cc
@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstsid_la-gstsiddec.Tpo $(DEPDIR)/libgstsid_la-gstsiddec.Plo
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='gstsiddec.cc' object='libgstsid_la-gstsiddec.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(libgstsid_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstsid_la_CXXFLAGS) $(CXXFLAGS) -c -o libgstsid_la-gstsiddec.lo `test -f 'gstsiddec.cc' || echo '$(srcdir)/'`gstsiddec.cc
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstsid_la_CXXFLAGS) $(CXXFLAGS) -c -o libgstsid_la-gstsiddec.lo `test -f 'gstsiddec.cc' || echo '$(srcdir)/'`gstsiddec.cc
mostlyclean-libtool:
-rm -f *.lo
diff --git a/ext/sidplay/gstsiddec.cc b/ext/sidplay/gstsiddec.cc
index d09259d..ec17bfd 100644
--- a/ext/sidplay/gstsiddec.cc
+++ b/ext/sidplay/gstsiddec.cc
@@ -771,6 +771,6 @@
GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
GST_VERSION_MINOR,
- siddec,
+ sid,
"Uses libsidplay to decode .sid files",
plugin_init, VERSION, "GPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN);
diff --git a/ext/sidplay/meson.build b/ext/sidplay/meson.build
new file mode 100644
index 0000000..7781938
--- /dev/null
+++ b/ext/sidplay/meson.build
@@ -0,0 +1,32 @@
+# sidplay plugin works with libsidplay 1.36.x (not 2.x.x)
+have_sidplay = false
+if add_languages('cpp')
+ extra_args = []
+ cxx = meson.get_compiler('cpp')
+ if cxx.has_argument('-fvisibility=hidden')
+ extra_args += ['-fvisibility=hidden']
+ endif
+ if cxx.has_argument('-fno-strict-aliasing')
+ extra_args += ['-fno-strict-aliasing']
+ endif
+
+ if cxx.has_header('sidplay/player.h')
+ sid_code = '''#include <sidplay/player.h>
+ void somefunc (void) {
+ sidTune tune = sidTune(0);
+ }'''
+ sidplay_dep = cxx.find_library('sidplay', required: false)
+ if sidplay_dep.found()
+ have_sidplay = cxx.compiles(sid_code, dependencies: sidplay_dep, name : 'sidplay')
+ endif
+ endif
+endif
+
+if have_sidplay
+ shared_module('gstsid', 'gstsiddec.cc',
+ cpp_args : ugly_args + extra_args,
+ include_directories : [configinc],
+ dependencies : [gstaudio_dep, sidplay_dep],
+ install : true,
+ install_dir : plugins_install_dir)
+endif
diff --git a/ext/twolame/Makefile.am b/ext/twolame/Makefile.am
deleted file mode 100644
index b6de82c..0000000
--- a/ext/twolame/Makefile.am
+++ /dev/null
@@ -1,12 +0,0 @@
-plugin_LTLIBRARIES = libgsttwolame.la
-
-libgsttwolame_la_SOURCES = gsttwolamemp2enc.c
-libgsttwolame_la_CFLAGS = \
- $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(TWOLAME_CFLAGS)
-libgsttwolame_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \
- -lgstaudio-@GST_API_VERSION@ -lgstpbutils-@GST_API_VERSION@ \
- $(GST_LIBS) $(TWOLAME_LIBS)
-libgsttwolame_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgsttwolame_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
-
-noinst_HEADERS = gsttwolamemp2enc.h
diff --git a/ext/twolame/Makefile.in b/ext/twolame/Makefile.in
deleted file mode 100644
index 7a03b87..0000000
--- a/ext/twolame/Makefile.in
+++ /dev/null
@@ -1,844 +0,0 @@
-# Makefile.in generated by automake 1.15.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994-2017 Free Software Foundation, Inc.
-
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-
-VPATH = @srcdir@
-am__is_gnu_make = { \
- if test -z '$(MAKELEVEL)'; then \
- false; \
- elif test -n '$(MAKE_HOST)'; then \
- true; \
- elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
- true; \
- else \
- false; \
- fi; \
-}
-am__make_running_with_option = \
- case $${target_option-} in \
- ?) ;; \
- *) echo "am__make_running_with_option: internal error: invalid" \
- "target option '$${target_option-}' specified" >&2; \
- exit 1;; \
- esac; \
- has_opt=no; \
- sane_makeflags=$$MAKEFLAGS; \
- if $(am__is_gnu_make); then \
- sane_makeflags=$$MFLAGS; \
- else \
- case $$MAKEFLAGS in \
- *\\[\ \ ]*) \
- bs=\\; \
- sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
- | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
- esac; \
- fi; \
- skip_next=no; \
- strip_trailopt () \
- { \
- flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
- }; \
- for flg in $$sane_makeflags; do \
- test $$skip_next = yes && { skip_next=no; continue; }; \
- case $$flg in \
- *=*|--*) continue;; \
- -*I) strip_trailopt 'I'; skip_next=yes;; \
- -*I?*) strip_trailopt 'I';; \
- -*O) strip_trailopt 'O'; skip_next=yes;; \
- -*O?*) strip_trailopt 'O';; \
- -*l) strip_trailopt 'l'; skip_next=yes;; \
- -*l?*) strip_trailopt 'l';; \
- -[dEDm]) skip_next=yes;; \
- -[JT]) skip_next=yes;; \
- esac; \
- case $$flg in \
- *$$target_option*) has_opt=yes; break;; \
- esac; \
- done; \
- test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-target_triplet = @target@
-subdir = ext/twolame
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \
- $(top_srcdir)/common/m4/as-auto-alt.m4 \
- $(top_srcdir)/common/m4/as-compiler-flag.m4 \
- $(top_srcdir)/common/m4/as-libtool.m4 \
- $(top_srcdir)/common/m4/as-version.m4 \
- $(top_srcdir)/common/m4/ax_create_stdint_h.m4 \
- $(top_srcdir)/common/m4/gst-arch.m4 \
- $(top_srcdir)/common/m4/gst-args.m4 \
- $(top_srcdir)/common/m4/gst-check.m4 \
- $(top_srcdir)/common/m4/gst-default.m4 \
- $(top_srcdir)/common/m4/gst-dowhile.m4 \
- $(top_srcdir)/common/m4/gst-error.m4 \
- $(top_srcdir)/common/m4/gst-feature.m4 \
- $(top_srcdir)/common/m4/gst-function.m4 \
- $(top_srcdir)/common/m4/gst-gettext.m4 \
- $(top_srcdir)/common/m4/gst-glib2.m4 \
- $(top_srcdir)/common/m4/gst-package-release-datetime.m4 \
- $(top_srcdir)/common/m4/gst-plugin-docs.m4 \
- $(top_srcdir)/common/m4/gst-plugindir.m4 \
- $(top_srcdir)/common/m4/gst.m4 \
- $(top_srcdir)/common/m4/gtk-doc.m4 \
- $(top_srcdir)/common/m4/orc.m4 $(top_srcdir)/common/m4/pkg.m4 \
- $(top_srcdir)/m4/a52.m4 $(top_srcdir)/m4/gettext.m4 \
- $(top_srcdir)/m4/gst-sid.m4 $(top_srcdir)/m4/iconv.m4 \
- $(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/lib-ld.m4 \
- $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
- $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
- $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
- $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
- $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
- $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-DIST_COMMON = $(srcdir)/Makefile.am $(noinst_HEADERS) \
- $(am__DIST_COMMON)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
- *) f=$$p;; \
- esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
- srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
- for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
- for p in $$list; do echo "$$p $$p"; done | \
- sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
- $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
- if (++n[$$2] == $(am__install_max)) \
- { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
- END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
- sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
- sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
- test -z "$$files" \
- || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
- || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
- $(am__cd) "$$dir" && rm -f $$files; }; \
- }
-am__installdirs = "$(DESTDIR)$(plugindir)"
-LTLIBRARIES = $(plugin_LTLIBRARIES)
-am__DEPENDENCIES_1 =
-libgsttwolame_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
-am_libgsttwolame_la_OBJECTS = libgsttwolame_la-gsttwolamemp2enc.lo
-libgsttwolame_la_OBJECTS = $(am_libgsttwolame_la_OBJECTS)
-AM_V_lt = $(am__v_lt_@AM_V@)
-am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
-am__v_lt_0 = --silent
-am__v_lt_1 =
-libgsttwolame_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
- $(libgsttwolame_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
- $(CCLD) $(libgsttwolame_la_CFLAGS) $(CFLAGS) \
- $(libgsttwolame_la_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo " GEN " $@;
-am__v_GEN_1 =
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-am__v_at_1 =
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CFLAGS) $(CFLAGS)
-AM_V_CC = $(am__v_CC_@AM_V@)
-am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
-am__v_CC_0 = @echo " CC " $@;
-am__v_CC_1 =
-CCLD = $(CC)
-LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CCLD = $(am__v_CCLD_@AM_V@)
-am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
-am__v_CCLD_0 = @echo " CCLD " $@;
-am__v_CCLD_1 =
-SOURCES = $(libgsttwolame_la_SOURCES)
-DIST_SOURCES = $(libgsttwolame_la_SOURCES)
-am__can_run_installinfo = \
- case $$AM_UPDATE_INFO_DIR in \
- n|no|NO) false;; \
- *) (install-info --version) >/dev/null 2>&1;; \
- esac
-HEADERS = $(noinst_HEADERS)
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-# Read a list of newline-separated strings from the standard input,
-# and print each of them once, without duplicates. Input order is
-# *not* preserved.
-am__uniquify_input = $(AWK) '\
- BEGIN { nonempty = 0; } \
- { items[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in items) print i; }; } \
-'
-# Make sure the list of sources is unique. This is necessary because,
-# e.g., the same source file might be shared among _SOURCES variables
-# for different programs/libraries.
-am__define_uniq_tagged_files = \
- list='$(am__tagged_files)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | $(am__uniquify_input)`
-ETAGS = etags
-CTAGS = ctags
-am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-A52DEC_CFLAGS = @A52DEC_CFLAGS@
-A52DEC_LIBS = @A52DEC_LIBS@
-ACLOCAL = @ACLOCAL@
-ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
-AMRNB_CFLAGS = @AMRNB_CFLAGS@
-AMRNB_LIBS = @AMRNB_LIBS@
-AMRWB_CFLAGS = @AMRWB_CFLAGS@
-AMRWB_LIBS = @AMRWB_LIBS@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AR = @AR@
-AS = @AS@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCASFLAGS = @CCASFLAGS@
-CCDEPMODE = @CCDEPMODE@
-CDIO_CFLAGS = @CDIO_CFLAGS@
-CDIO_LIBS = @CDIO_LIBS@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFAULT_AUDIOSINK = @DEFAULT_AUDIOSINK@
-DEFAULT_AUDIOSRC = @DEFAULT_AUDIOSRC@
-DEFAULT_VIDEOSINK = @DEFAULT_VIDEOSINK@
-DEFAULT_VIDEOSRC = @DEFAULT_VIDEOSRC@
-DEFAULT_VISUALIZER = @DEFAULT_VISUALIZER@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DEPRECATED_CFLAGS = @DEPRECATED_CFLAGS@
-DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-DVDREAD_LIBS = @DVDREAD_LIBS@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-ERROR_CFLAGS = @ERROR_CFLAGS@
-ERROR_CXXFLAGS = @ERROR_CXXFLAGS@
-EXEEXT = @EXEEXT@
-FFLAGS = @FFLAGS@
-FGREP = @FGREP@
-GCOV = @GCOV@
-GCOV_CFLAGS = @GCOV_CFLAGS@
-GCOV_LIBS = @GCOV_LIBS@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GIO_CFLAGS = @GIO_CFLAGS@
-GIO_LDFLAGS = @GIO_LDFLAGS@
-GIO_LIBS = @GIO_LIBS@
-GLIB_CFLAGS = @GLIB_CFLAGS@
-GLIB_EXTRA_CFLAGS = @GLIB_EXTRA_CFLAGS@
-GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
-GLIB_LIBS = @GLIB_LIBS@
-GLIB_MKENUMS = @GLIB_MKENUMS@
-GLIB_PREFIX = @GLIB_PREFIX@
-GLIB_REQ = @GLIB_REQ@
-GMODULE_NO_EXPORT_CFLAGS = @GMODULE_NO_EXPORT_CFLAGS@
-GMODULE_NO_EXPORT_LIBS = @GMODULE_NO_EXPORT_LIBS@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
-GREP = @GREP@
-GSTPB_PLUGINS_DIR = @GSTPB_PLUGINS_DIR@
-GSTPB_PREFIX = @GSTPB_PREFIX@
-GST_AGE = @GST_AGE@
-GST_ALL_LDFLAGS = @GST_ALL_LDFLAGS@
-GST_API_VERSION = @GST_API_VERSION@
-GST_BASE_CFLAGS = @GST_BASE_CFLAGS@
-GST_BASE_LIBS = @GST_BASE_LIBS@
-GST_CFLAGS = @GST_CFLAGS@
-GST_CHECK_CFLAGS = @GST_CHECK_CFLAGS@
-GST_CHECK_LIBS = @GST_CHECK_LIBS@
-GST_CURRENT = @GST_CURRENT@
-GST_CXXFLAGS = @GST_CXXFLAGS@
-GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@
-GST_LIBS = @GST_LIBS@
-GST_LIBVERSION = @GST_LIBVERSION@
-GST_LICENSE = @GST_LICENSE@
-GST_LT_LDFLAGS = @GST_LT_LDFLAGS@
-GST_OPTION_CFLAGS = @GST_OPTION_CFLAGS@
-GST_OPTION_CXXFLAGS = @GST_OPTION_CXXFLAGS@
-GST_PACKAGE_NAME = @GST_PACKAGE_NAME@
-GST_PACKAGE_ORIGIN = @GST_PACKAGE_ORIGIN@
-GST_PLUGINS_ALL = @GST_PLUGINS_ALL@
-GST_PLUGINS_BASE_CFLAGS = @GST_PLUGINS_BASE_CFLAGS@
-GST_PLUGINS_BASE_DIR = @GST_PLUGINS_BASE_DIR@
-GST_PLUGINS_BASE_LIBS = @GST_PLUGINS_BASE_LIBS@
-GST_PLUGINS_DIR = @GST_PLUGINS_DIR@
-GST_PLUGINS_NONPORTED = @GST_PLUGINS_NONPORTED@
-GST_PLUGINS_SELECTED = @GST_PLUGINS_SELECTED@
-GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
-GST_PLUGIN_LIBTOOLFLAGS = @GST_PLUGIN_LIBTOOLFLAGS@
-GST_PREFIX = @GST_PREFIX@
-GST_REVISION = @GST_REVISION@
-GST_TOOLS_DIR = @GST_TOOLS_DIR@
-GTKDOC_CHECK = @GTKDOC_CHECK@
-GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
-GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
-GTKDOC_MKPDF = @GTKDOC_MKPDF@
-GTKDOC_REBASE = @GTKDOC_REBASE@
-HAVE_CXX = @HAVE_CXX@
-HAVE_DVDREAD = @HAVE_DVDREAD@
-HAVE_LAME = @HAVE_LAME@
-HTML_DIR = @HTML_DIR@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-LAME_CFLAGS = @LAME_CFLAGS@
-LAME_LIBS = @LAME_LIBS@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBM = @LIBM@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LOCALEDIR = @LOCALEDIR@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-LTLIBOBJS = @LTLIBOBJS@
-LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MKDIR_P = @MKDIR_P@
-MPEG2DEC_CFLAGS = @MPEG2DEC_CFLAGS@
-MPEG2DEC_LIBS = @MPEG2DEC_LIBS@
-MPG123_CFLAGS = @MPG123_CFLAGS@
-MPG123_LIBS = @MPG123_LIBS@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-ORCC = @ORCC@
-ORCC_FLAGS = @ORCC_FLAGS@
-ORC_CFLAGS = @ORC_CFLAGS@
-ORC_LIBS = @ORC_LIBS@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PACKAGE_VERSION_MAJOR = @PACKAGE_VERSION_MAJOR@
-PACKAGE_VERSION_MICRO = @PACKAGE_VERSION_MICRO@
-PACKAGE_VERSION_MINOR = @PACKAGE_VERSION_MINOR@
-PACKAGE_VERSION_NANO = @PACKAGE_VERSION_NANO@
-PACKAGE_VERSION_RELEASE = @PACKAGE_VERSION_RELEASE@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PLUGINDIR = @PLUGINDIR@
-POSUB = @POSUB@
-PROFILE_CFLAGS = @PROFILE_CFLAGS@
-PYTHON = @PYTHON@
-PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
-PYTHON_PLATFORM = @PYTHON_PLATFORM@
-PYTHON_PREFIX = @PYTHON_PREFIX@
-PYTHON_VERSION = @PYTHON_VERSION@
-RANLIB = @RANLIB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SIDPLAY_CFLAGS = @SIDPLAY_CFLAGS@
-SIDPLAY_LIBS = @SIDPLAY_LIBS@
-STRIP = @STRIP@
-TWOLAME_CFLAGS = @TWOLAME_CFLAGS@
-TWOLAME_LIBS = @TWOLAME_LIBS@
-USE_NLS = @USE_NLS@
-VALGRIND_CFLAGS = @VALGRIND_CFLAGS@
-VALGRIND_LIBS = @VALGRIND_LIBS@
-VALGRIND_PATH = @VALGRIND_PATH@
-VERSION = @VERSION@
-WARNING_CFLAGS = @WARNING_CFLAGS@
-WARNING_CXXFLAGS = @WARNING_CXXFLAGS@
-WIN32_LIBS = @WIN32_LIBS@
-X264_CFLAGS = @X264_CFLAGS@
-X264_LIBS = @X264_LIBS@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-pkgpyexecdir = @pkgpyexecdir@
-pkgpythondir = @pkgpythondir@
-plugindir = @plugindir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-pyexecdir = @pyexecdir@
-pythondir = @pythondir@
-runstatedir = @runstatedir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target = @target@
-target_alias = @target_alias@
-target_cpu = @target_cpu@
-target_os = @target_os@
-target_vendor = @target_vendor@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-plugin_LTLIBRARIES = libgsttwolame.la
-libgsttwolame_la_SOURCES = gsttwolamemp2enc.c
-libgsttwolame_la_CFLAGS = \
- $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(TWOLAME_CFLAGS)
-
-libgsttwolame_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \
- -lgstaudio-@GST_API_VERSION@ -lgstpbutils-@GST_API_VERSION@ \
- $(GST_LIBS) $(TWOLAME_LIBS)
-
-libgsttwolame_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgsttwolame_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
-noinst_HEADERS = gsttwolamemp2enc.h
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
- && { if test -f $@; then exit 0; else break; fi; }; \
- exit 1;; \
- esac; \
- done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu ext/twolame/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu ext/twolame/Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- @case '$?' in \
- *config.status*) \
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
- *) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
- esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
- @$(NORMAL_INSTALL)
- @list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \
- list2=; for p in $$list; do \
- if test -f $$p; then \
- list2="$$list2 $$p"; \
- else :; fi; \
- done; \
- test -z "$$list2" || { \
- echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
- $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \
- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \
- }
-
-uninstall-pluginLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
- @list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \
- for p in $$list; do \
- $(am__strip_dir) \
- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$f'"; \
- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$f"; \
- done
-
-clean-pluginLTLIBRARIES:
- -test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES)
- @list='$(plugin_LTLIBRARIES)'; \
- locs=`for p in $$list; do echo $$p; done | \
- sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
- sort -u`; \
- test -z "$$locs" || { \
- echo rm -f $${locs}; \
- rm -f $${locs}; \
- }
-
-libgsttwolame.la: $(libgsttwolame_la_OBJECTS) $(libgsttwolame_la_DEPENDENCIES) $(EXTRA_libgsttwolame_la_DEPENDENCIES)
- $(AM_V_CCLD)$(libgsttwolame_la_LINK) -rpath $(plugindir) $(libgsttwolame_la_OBJECTS) $(libgsttwolame_la_LIBADD) $(LIBS)
-
-mostlyclean-compile:
- -rm -f *.$(OBJEXT)
-
-distclean-compile:
- -rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgsttwolame_la-gsttwolamemp2enc.Plo@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
-
-.c.obj:
-@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
-@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
-@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
-
-libgsttwolame_la-gsttwolamemp2enc.lo: gsttwolamemp2enc.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgsttwolame_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgsttwolame_la_CFLAGS) $(CFLAGS) -MT libgsttwolame_la-gsttwolamemp2enc.lo -MD -MP -MF $(DEPDIR)/libgsttwolame_la-gsttwolamemp2enc.Tpo -c -o libgsttwolame_la-gsttwolamemp2enc.lo `test -f 'gsttwolamemp2enc.c' || echo '$(srcdir)/'`gsttwolamemp2enc.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgsttwolame_la-gsttwolamemp2enc.Tpo $(DEPDIR)/libgsttwolame_la-gsttwolamemp2enc.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gsttwolamemp2enc.c' object='libgsttwolame_la-gsttwolamemp2enc.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgsttwolame_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgsttwolame_la_CFLAGS) $(CFLAGS) -c -o libgsttwolame_la-gsttwolamemp2enc.lo `test -f 'gsttwolamemp2enc.c' || echo '$(srcdir)/'`gsttwolamemp2enc.c
-
-mostlyclean-libtool:
- -rm -f *.lo
-
-clean-libtool:
- -rm -rf .libs _libs
-
-ID: $(am__tagged_files)
- $(am__define_uniq_tagged_files); mkid -fID $$unique
-tags: tags-am
-TAGS: tags
-
-tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
- set x; \
- here=`pwd`; \
- $(am__define_uniq_tagged_files); \
- shift; \
- if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- if test $$# -gt 0; then \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- "$$@" $$unique; \
- else \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$unique; \
- fi; \
- fi
-ctags: ctags-am
-
-CTAGS: ctags
-ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
- $(am__define_uniq_tagged_files); \
- test -z "$(CTAGS_ARGS)$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$unique
-
-GTAGS:
- here=`$(am__cd) $(top_builddir) && pwd` \
- && $(am__cd) $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) "$$here"
-cscopelist: cscopelist-am
-
-cscopelist-am: $(am__tagged_files)
- list='$(am__tagged_files)'; \
- case "$(srcdir)" in \
- [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
- *) sdir=$(subdir)/$(srcdir) ;; \
- esac; \
- for i in $$list; do \
- if test -f "$$i"; then \
- echo "$(subdir)/$$i"; \
- else \
- echo "$$sdir/$$i"; \
- fi; \
- done >> $(top_builddir)/cscope.files
-
-distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
- list='$(DISTFILES)'; \
- dist_files=`for file in $$list; do echo $$file; done | \
- sed -e "s|^$$srcdirstrip/||;t" \
- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
- case $$dist_files in \
- */*) $(MKDIR_P) `echo "$$dist_files" | \
- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
- sort -u` ;; \
- esac; \
- for file in $$dist_files; do \
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- if test -d $$d/$$file; then \
- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test -d "$(distdir)/$$file"; then \
- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
- fi; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
- fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
- else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
- || exit 1; \
- fi; \
- done
-check-am: all-am
-check: check-am
-all-am: Makefile $(LTLIBRARIES) $(HEADERS)
-installdirs:
- for dir in "$(DESTDIR)$(plugindir)"; do \
- test -z "$$dir" || $(MKDIR_P) "$$dir"; \
- done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
- if test -z '$(STRIP)'; then \
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- install; \
- else \
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
- fi
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
- -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
- @echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool clean-pluginLTLIBRARIES \
- mostlyclean-am
-
-distclean: distclean-am
- -rm -rf ./$(DEPDIR)
- -rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
- distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-pluginLTLIBRARIES
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
- -rm -rf ./$(DEPDIR)
- -rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
- mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-pluginLTLIBRARIES
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
- clean-libtool clean-pluginLTLIBRARIES cscopelist-am ctags \
- ctags-am distclean distclean-compile distclean-generic \
- distclean-libtool distclean-tags distdir dvi dvi-am html \
- html-am info info-am install install-am install-data \
- install-data-am install-dvi install-dvi-am install-exec \
- install-exec-am install-html install-html-am install-info \
- install-info-am install-man install-pdf install-pdf-am \
- install-pluginLTLIBRARIES install-ps install-ps-am \
- install-strip installcheck installcheck-am installdirs \
- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
- pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
- uninstall-pluginLTLIBRARIES
-
-.PRECIOUS: Makefile
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/ext/twolame/gsttwolamemp2enc.c b/ext/twolame/gsttwolamemp2enc.c
deleted file mode 100644
index 31bec6b..0000000
--- a/ext/twolame/gsttwolamemp2enc.c
+++ /dev/null
@@ -1,893 +0,0 @@
-/* GStreamer
- * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu>
- * Copyright (C) <2004> Wim Taymans <wim@fluendo.com>
- * Copyright (C) <2005> Thomas Vander Stichele <thomas at apestaart dot org>
- * Copyright (C) <2008> Sebastian Dröge <sebastian.droege@collabora.co.uk>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-/*
- * Based on the lame element.
- */
-
-/**
- * SECTION:element-twolame
- * @see_also: mad, lame
- *
- * This element encodes raw integer audio into an MPEG-1 layer 2 (MP2) stream.
- *
- * <refsect2>
- * <title>Example pipelines</title>
- * |[
- * gst-launch-1.0 -v audiotestsrc wave=sine num-buffers=100 ! audioconvert ! twolame ! filesink location=sine.mp2
- * ]| Encode a test sine signal to MP2.
- * |[
- * gst-launch-1.0 -v alsasrc ! audioconvert ! twolame bitrate=192 ! filesink location=alsasrc.mp2
- * ]| Record from a sound card using ALSA and encode to MP2
- * |[
- * gst-launch-1.0 -v filesrc location=music.wav ! decodebin ! audioconvert ! audioresample ! twolame bitrate=192 ! id3v2mux ! filesink location=music.mp2
- * ]| Transcode from a .wav file to MP2 (the id3v2mux element is optional)
- * |[
- * gst-launch-1.0 -v cdda://5 ! audioconvert ! twolame bitrate=192 ! filesink location=track5.mp2
- * ]| Encode Audio CD track 5 to MP2
- * </refsect2>
- *
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "string.h"
-#include "gsttwolamemp2enc.h"
-#include "gst/gst-i18n-plugin.h"
-
-GST_DEBUG_CATEGORY_STATIC (debug);
-#define GST_CAT_DEFAULT debug
-
-/* TwoLAME can do MPEG-1, MPEG-2 so it has 6 possible
- * sample rates it supports */
-static GstStaticPadTemplate gst_two_lame_sink_template =
- GST_STATIC_PAD_TEMPLATE ("sink",
- GST_PAD_SINK,
- GST_PAD_ALWAYS,
- GST_STATIC_CAPS ("audio/x-raw, "
- "format = (string) { " GST_AUDIO_NE (F32) ", " GST_AUDIO_NE (S16) " }, "
- "layout = (string) interleaved, "
- "rate = (int) { 16000, 22050, 24000, 32000, 44100, 48000 }, "
- "channels = (int) 1; "
- "audio/x-raw, "
- "format = (string) { " GST_AUDIO_NE (F32) ", " GST_AUDIO_NE (S16) " }, "
- "layout = (string) interleaved, "
- "rate = (int) { 16000, 22050, 24000, 32000, 44100, 48000 }, "
- "channels = (int) 2," "channel-mask = (bitmask) 0x3")
- );
-
-static GstStaticPadTemplate gst_two_lame_src_template =
-GST_STATIC_PAD_TEMPLATE ("src",
- GST_PAD_SRC,
- GST_PAD_ALWAYS,
- GST_STATIC_CAPS ("audio/mpeg, "
- "mpegversion = (int) 1, "
- "layer = (int) 2, "
- "rate = (int) { 16000, 22050, 24000, 32000, 44100, 48000 }, "
- "channels = (int) [ 1, 2 ]")
- );
-
-static struct
-{
- gint mode;
- gint psymodel;
- gint bitrate;
- gint padding;
- gboolean energy_level_extension;
- gint emphasis;
- gboolean error_protection;
- gboolean copyright;
- gboolean original;
- gboolean vbr;
- gfloat vbr_level;
- gfloat ath_level;
- gint vbr_max_bitrate;
- gboolean quick_mode;
- gint quick_mode_count;
-} gst_two_lame_default_settings;
-
-/********** Define useful types for non-programmatic interfaces **********/
-#define GST_TYPE_TWO_LAME_MODE (gst_two_lame_mode_get_type())
-static GType
-gst_two_lame_mode_get_type (void)
-{
- static GType two_lame_mode_type = 0;
- static const GEnumValue two_lame_modes[] = {
- {TWOLAME_AUTO_MODE, "Auto", "auto"},
- {TWOLAME_STEREO, "Stereo", "stereo"},
- {TWOLAME_JOINT_STEREO, "Joint Stereo", "joint"},
- {TWOLAME_DUAL_CHANNEL, "Dual Channel", "dual"},
- {TWOLAME_MONO, "Mono", "mono"},
- {0, NULL, NULL}
- };
-
- if (!two_lame_mode_type) {
- two_lame_mode_type =
- g_enum_register_static ("GstTwoLameMode", two_lame_modes);
- }
- return two_lame_mode_type;
-}
-
-#define GST_TYPE_TWO_LAME_PADDING (gst_two_lame_padding_get_type())
-static GType
-gst_two_lame_padding_get_type (void)
-{
- static GType two_lame_padding_type = 0;
- static const GEnumValue two_lame_padding[] = {
- {TWOLAME_PAD_NO, "No Padding", "never"},
- {TWOLAME_PAD_ALL, "Always Pad", "always"},
- {0, NULL, NULL}
- };
-
- if (!two_lame_padding_type) {
- two_lame_padding_type =
- g_enum_register_static ("GstTwoLamePadding", two_lame_padding);
- }
- return two_lame_padding_type;
-}
-
-#define GST_TYPE_TWO_LAME_EMPHASIS (gst_two_lame_emphasis_get_type())
-static GType
-gst_two_lame_emphasis_get_type (void)
-{
- static GType two_lame_emphasis_type = 0;
- static const GEnumValue two_lame_emphasis[] = {
- {TWOLAME_EMPHASIS_N, "No emphasis", "none"},
- {TWOLAME_EMPHASIS_5, "50/15 ms", "5"},
- {TWOLAME_EMPHASIS_C, "CCIT J.17", "ccit"},
- {0, NULL, NULL}
- };
-
- if (!two_lame_emphasis_type) {
- two_lame_emphasis_type =
- g_enum_register_static ("GstTwoLameEmphasis", two_lame_emphasis);
- }
-
- return two_lame_emphasis_type;
-}
-
-/********** Standard stuff for signals and arguments **********/
-
-enum
-{
- ARG_0,
- ARG_MODE,
- ARG_PSYMODEL,
- ARG_BITRATE,
- ARG_PADDING,
- ARG_ENERGY_LEVEL_EXTENSION,
- ARG_EMPHASIS,
- ARG_ERROR_PROTECTION,
- ARG_COPYRIGHT,
- ARG_ORIGINAL,
- ARG_VBR,
- ARG_VBR_LEVEL,
- ARG_ATH_LEVEL,
- ARG_VBR_MAX_BITRATE,
- ARG_QUICK_MODE,
- ARG_QUICK_MODE_COUNT
-};
-
-static gboolean gst_two_lame_start (GstAudioEncoder * enc);
-static gboolean gst_two_lame_stop (GstAudioEncoder * enc);
-static gboolean gst_two_lame_set_format (GstAudioEncoder * enc,
- GstAudioInfo * info);
-static GstFlowReturn gst_two_lame_handle_frame (GstAudioEncoder * enc,
- GstBuffer * in_buf);
-static void gst_two_lame_flush (GstAudioEncoder * enc);
-
-static void gst_two_lame_set_property (GObject * object, guint prop_id,
- const GValue * value, GParamSpec * pspec);
-static void gst_two_lame_get_property (GObject * object, guint prop_id,
- GValue * value, GParamSpec * pspec);
-static gboolean gst_two_lame_setup (GstTwoLame * twolame);
-
-G_DEFINE_TYPE (GstTwoLame, gst_two_lame, GST_TYPE_AUDIO_ENCODER);
-
-static void
-gst_two_lame_release_memory (GstTwoLame * twolame)
-{
- if (twolame->glopts) {
- twolame_close (&twolame->glopts);
- twolame->glopts = NULL;
- }
-}
-
-static void
-gst_two_lame_finalize (GObject * obj)
-{
- gst_two_lame_release_memory (GST_TWO_LAME (obj));
-
- G_OBJECT_CLASS (gst_two_lame_parent_class)->finalize (obj);
-}
-
-static void
-gst_two_lame_class_init (GstTwoLameClass * klass)
-{
- GObjectClass *gobject_class;
- GstAudioEncoderClass *gstbase_class;
-
- gobject_class = (GObjectClass *) klass;
- gstbase_class = (GstAudioEncoderClass *) klass;
-
- gobject_class->set_property = gst_two_lame_set_property;
- gobject_class->get_property = gst_two_lame_get_property;
- gobject_class->finalize = gst_two_lame_finalize;
-
- gstbase_class->start = GST_DEBUG_FUNCPTR (gst_two_lame_start);
- gstbase_class->stop = GST_DEBUG_FUNCPTR (gst_two_lame_stop);
- gstbase_class->set_format = GST_DEBUG_FUNCPTR (gst_two_lame_set_format);
- gstbase_class->handle_frame = GST_DEBUG_FUNCPTR (gst_two_lame_handle_frame);
- gstbase_class->flush = GST_DEBUG_FUNCPTR (gst_two_lame_flush);
-
- g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_MODE,
- g_param_spec_enum ("mode", "Mode", "Encoding mode",
- GST_TYPE_TWO_LAME_MODE, gst_two_lame_default_settings.mode,
- G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
-
- g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_PSYMODEL,
- g_param_spec_int ("psymodel", "Psychoacoustic Model",
- "Psychoacoustic model used to encode the audio",
- -1, 4, gst_two_lame_default_settings.psymodel,
- G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
-
- g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_BITRATE,
- g_param_spec_int ("bitrate", "Bitrate (kb/s)",
- "Bitrate in kbit/sec (8, 16, 24, 32, 40, 48, 56, 64, 80, 96, "
- "112, 128, 144, 160, 192, 224, 256, 320, 384)",
- 8, 384, gst_two_lame_default_settings.bitrate,
- G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
-
- g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_PADDING,
- g_param_spec_enum ("padding", "Padding", "Padding type",
- GST_TYPE_TWO_LAME_PADDING, gst_two_lame_default_settings.padding,
- G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
-
- g_object_class_install_property (G_OBJECT_CLASS (klass),
- ARG_ENERGY_LEVEL_EXTENSION,
- g_param_spec_boolean ("energy-level-extension", "Energy Level Extension",
- "Write peak PCM level to each frame",
- gst_two_lame_default_settings.energy_level_extension,
- G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
-
- g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_EMPHASIS,
- g_param_spec_enum ("emphasis", "Emphasis",
- "Pre-emphasis to apply to the decoded audio",
- GST_TYPE_TWO_LAME_EMPHASIS, gst_two_lame_default_settings.emphasis,
- G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
-
- g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_ERROR_PROTECTION,
- g_param_spec_boolean ("error-protection", "Error protection",
- "Adds checksum to every frame",
- gst_two_lame_default_settings.error_protection,
- G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
-
- g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_COPYRIGHT,
- g_param_spec_boolean ("copyright", "Copyright", "Mark as copyright",
- gst_two_lame_default_settings.copyright,
- G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
-
- g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_ORIGINAL,
- g_param_spec_boolean ("original", "Original", "Mark as original",
- gst_two_lame_default_settings.original,
- G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
-
- g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_VBR,
- g_param_spec_boolean ("vbr", "VBR", "Enable variable bitrate mode",
- gst_two_lame_default_settings.vbr,
- G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
-
- g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_VBR_LEVEL,
- g_param_spec_float ("vbr-level", "VBR Level", "VBR Level",
- -10.0, 10.0, gst_two_lame_default_settings.vbr_level,
- G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
-
- g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_ATH_LEVEL,
- g_param_spec_float ("ath-level", "ATH Level", "ATH Level in dB",
- -G_MAXFLOAT, G_MAXFLOAT, gst_two_lame_default_settings.ath_level,
- G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
-
- g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_VBR_MAX_BITRATE,
- g_param_spec_int ("vbr-max-bitrate", "VBR max bitrate",
- "Specify maximum VBR bitrate (0=off, 8, 16, 24, 32, 40, 48, 56, 64, 80, 96, "
- "112, 128, 144, 160, 192, 224, 256, 320, 384)",
- 0, 384, gst_two_lame_default_settings.vbr_max_bitrate,
- G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
-
- g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_QUICK_MODE,
- g_param_spec_boolean ("quick-mode", "Quick mode",
- "Calculate Psymodel every frames",
- gst_two_lame_default_settings.quick_mode,
- G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
-
- g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_QUICK_MODE_COUNT,
- g_param_spec_int ("quick-mode-count", "Quick mode count",
- "Calculate Psymodel every n frames",
- 0, G_MAXINT, gst_two_lame_default_settings.quick_mode_count,
- G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
-
- gst_element_class_add_static_pad_template (GST_ELEMENT_CLASS (klass),
- &gst_two_lame_src_template);
- gst_element_class_add_static_pad_template (GST_ELEMENT_CLASS (klass),
- &gst_two_lame_sink_template);
-
- gst_element_class_set_static_metadata (GST_ELEMENT_CLASS (klass),
- "TwoLAME mp2 encoder", "Codec/Encoder/Audio",
- "High-quality free MP2 encoder",
- "Sebastian Dröge <sebastian.droege@collabora.co.uk>");
-}
-
-static gboolean
-gst_two_lame_set_format (GstAudioEncoder * enc, GstAudioInfo * info)
-{
- GstTwoLame *twolame;
- gint out_samplerate;
- gint version;
- GstCaps *othercaps;
-
- twolame = GST_TWO_LAME (enc);
-
- /* parameters already parsed for us */
- twolame->samplerate = GST_AUDIO_INFO_RATE (info);
- twolame->num_channels = GST_AUDIO_INFO_CHANNELS (info);
- twolame->float_input = !GST_AUDIO_INFO_IS_INTEGER (info);
-
- /* but we might be asked to reconfigure, so reset */
- gst_two_lame_release_memory (twolame);
-
- GST_DEBUG_OBJECT (twolame, "setting up twolame");
- if (!gst_two_lame_setup (twolame))
- goto setup_failed;
-
- out_samplerate = twolame_get_out_samplerate (twolame->glopts);
- if (out_samplerate == 0)
- goto zero_output_rate;
-
- if (out_samplerate != twolame->samplerate) {
- GST_WARNING_OBJECT (twolame,
- "output samplerate %d is different from incoming samplerate %d",
- out_samplerate, twolame->samplerate);
- }
-
- version = twolame_get_version (twolame->glopts);
- if (version == TWOLAME_MPEG2)
- version = 2;
- else
- version = 1;
-
- othercaps =
- gst_caps_new_simple ("audio/mpeg",
- "mpegversion", G_TYPE_INT, 1,
- "mpegaudioversion", G_TYPE_INT, version,
- "layer", G_TYPE_INT, 2,
- "channels", G_TYPE_INT,
- twolame->mode == TWOLAME_MONO ? 1 : twolame->num_channels, "rate",
- G_TYPE_INT, out_samplerate, NULL);
-
- /* and use these caps */
- gst_audio_encoder_set_output_format (GST_AUDIO_ENCODER (twolame), othercaps);
- gst_caps_unref (othercaps);
-
- /* report needs to base class:
- * hand one frame at a time, if we are pretty sure what a frame is */
- if (out_samplerate == twolame->samplerate) {
- gst_audio_encoder_set_frame_samples_min (enc, 1152);
- gst_audio_encoder_set_frame_samples_max (enc, 1152);
- gst_audio_encoder_set_frame_max (enc, 1);
- }
-
- return TRUE;
-
-zero_output_rate:
- {
- GST_ELEMENT_ERROR (twolame, LIBRARY, SETTINGS, (NULL),
- ("TwoLAME decided on a zero sample rate"));
- return FALSE;
- }
-setup_failed:
- {
- GST_ELEMENT_ERROR (twolame, LIBRARY, SETTINGS,
- (_("Failed to configure TwoLAME encoder. Check your encoding parameters.")), (NULL));
- return FALSE;
- }
-}
-
-static void
-gst_two_lame_init (GstTwoLame * twolame)
-{
- GST_DEBUG_OBJECT (twolame, "starting initialization");
-
- GST_PAD_SET_ACCEPT_TEMPLATE (GST_AUDIO_ENCODER_SINK_PAD (twolame));
-
- twolame->mode = gst_two_lame_default_settings.mode;
- twolame->psymodel = gst_two_lame_default_settings.psymodel;
- twolame->bitrate = gst_two_lame_default_settings.bitrate;
- twolame->padding = gst_two_lame_default_settings.padding;
- twolame->energy_level_extension =
- gst_two_lame_default_settings.energy_level_extension;
- twolame->emphasis = gst_two_lame_default_settings.emphasis;
- twolame->error_protection = gst_two_lame_default_settings.error_protection;
- twolame->copyright = gst_two_lame_default_settings.copyright;
- twolame->original = gst_two_lame_default_settings.original;
- twolame->vbr = gst_two_lame_default_settings.vbr;
- twolame->vbr_level = gst_two_lame_default_settings.vbr_level;
- twolame->ath_level = gst_two_lame_default_settings.ath_level;
- twolame->vbr_max_bitrate = gst_two_lame_default_settings.vbr_max_bitrate;
- twolame->quick_mode = gst_two_lame_default_settings.quick_mode;
- twolame->quick_mode_count = gst_two_lame_default_settings.quick_mode_count;
-
- GST_DEBUG_OBJECT (twolame, "done initializing");
-}
-
-static gboolean
-gst_two_lame_start (GstAudioEncoder * enc)
-{
- GstTwoLame *twolame = GST_TWO_LAME (enc);
-
- GST_DEBUG_OBJECT (twolame, "start");
- return TRUE;
-}
-
-static gboolean
-gst_two_lame_stop (GstAudioEncoder * enc)
-{
- GstTwoLame *twolame = GST_TWO_LAME (enc);
-
- GST_DEBUG_OBJECT (twolame, "stop");
-
- gst_two_lame_release_memory (twolame);
- return TRUE;
-}
-
-/* <php-emulation-mode>three underscores for ___rate is really really really
- * private as opposed to one underscore<php-emulation-mode> */
-/* call this MACRO outside of the NULL state so that we have a higher chance
- * of actually having a pipeline and bus to get the message through */
-
-#define CHECK_AND_FIXUP_BITRATE(obj,param,rate) \
-G_STMT_START { \
- gint ___rate = rate; \
- gint maxrate = 320; \
- gint multiplier = 64; \
- if (rate <= 64) { \
- maxrate = 64; multiplier = 8; \
- if ((rate % 8) != 0) ___rate = GST_ROUND_UP_8 (rate); \
- } else if (rate <= 144) { \
- maxrate = 144; multiplier = 16; \
- if ((rate % 16) != 0) ___rate = GST_ROUND_UP_16 (rate); \
- } else if (rate <= 256) { \
- maxrate = 256; multiplier = 32; \
- if ((rate % 32) != 0) ___rate = GST_ROUND_UP_32 (rate); \
- } else if (rate <= 384) { \
- maxrate = 384; multiplier = 64; \
- if ((rate % 64) != 0) ___rate = GST_ROUND_UP_64 (rate); \
- } \
- if (___rate != rate) { \
- GST_ELEMENT_WARNING (obj, LIBRARY, SETTINGS, \
- (_("The requested bitrate %d kbit/s for property '%s' " \
- "is not allowed. " \
- "The bitrate was changed to %d kbit/s."), rate, \
- param, ___rate), \
- ("A bitrate below %d should be a multiple of %d.", \
- maxrate, multiplier)); \
- rate = ___rate; \
- } \
-} G_STMT_END
-
-static void
-gst_two_lame_set_property (GObject * object, guint prop_id,
- const GValue * value, GParamSpec * pspec)
-{
- GstTwoLame *twolame = GST_TWO_LAME (object);
-
- switch (prop_id) {
- case ARG_MODE:
- twolame->mode = g_value_get_enum (value);
- break;
- case ARG_PSYMODEL:
- twolame->psymodel = g_value_get_int (value);
- break;
- case ARG_BITRATE:
- twolame->bitrate = g_value_get_int (value);
- break;
- case ARG_PADDING:
- twolame->padding = g_value_get_enum (value);
- break;
- case ARG_ENERGY_LEVEL_EXTENSION:
- twolame->energy_level_extension = g_value_get_boolean (value);
- break;
- case ARG_EMPHASIS:
- twolame->emphasis = g_value_get_enum (value);
- break;
- case ARG_ERROR_PROTECTION:
- twolame->error_protection = g_value_get_boolean (value);
- break;
- case ARG_COPYRIGHT:
- twolame->copyright = g_value_get_boolean (value);
- break;
- case ARG_ORIGINAL:
- twolame->original = g_value_get_boolean (value);
- break;
- case ARG_VBR:
- twolame->vbr = g_value_get_boolean (value);
- break;
- case ARG_VBR_LEVEL:
- twolame->vbr_level = g_value_get_float (value);
- break;
- case ARG_ATH_LEVEL:
- twolame->ath_level = g_value_get_float (value);
- break;
- case ARG_VBR_MAX_BITRATE:
- twolame->vbr_max_bitrate = g_value_get_int (value);
- break;
- case ARG_QUICK_MODE:
- twolame->quick_mode = g_value_get_boolean (value);
- break;
- case ARG_QUICK_MODE_COUNT:
- twolame->quick_mode_count = g_value_get_int (value);
- break;
- default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
- break;
- }
-}
-
-static void
-gst_two_lame_get_property (GObject * object, guint prop_id, GValue * value,
- GParamSpec * pspec)
-{
- GstTwoLame *twolame = GST_TWO_LAME (object);
-
- switch (prop_id) {
- case ARG_MODE:
- g_value_set_enum (value, twolame->mode);
- break;
- case ARG_PSYMODEL:
- g_value_set_int (value, twolame->psymodel);
- break;
- case ARG_BITRATE:
- g_value_set_int (value, twolame->bitrate);
- break;
- case ARG_PADDING:
- g_value_set_enum (value, twolame->padding);
- break;
- case ARG_ENERGY_LEVEL_EXTENSION:
- g_value_set_boolean (value, twolame->energy_level_extension);
- break;
- case ARG_EMPHASIS:
- g_value_set_enum (value, twolame->emphasis);
- break;
- case ARG_ERROR_PROTECTION:
- g_value_set_boolean (value, twolame->error_protection);
- break;
- case ARG_COPYRIGHT:
- g_value_set_boolean (value, twolame->copyright);
- break;
- case ARG_ORIGINAL:
- g_value_set_boolean (value, twolame->original);
- break;
- case ARG_VBR:
- g_value_set_boolean (value, twolame->vbr);
- break;
- case ARG_VBR_LEVEL:
- g_value_set_float (value, twolame->vbr_level);
- break;
- case ARG_ATH_LEVEL:
- g_value_set_float (value, twolame->ath_level);
- break;
- case ARG_VBR_MAX_BITRATE:
- g_value_set_int (value, twolame->vbr_max_bitrate);
- break;
- case ARG_QUICK_MODE:
- g_value_set_boolean (value, twolame->quick_mode);
- break;
- case ARG_QUICK_MODE_COUNT:
- g_value_set_int (value, twolame->quick_mode_count);
- break;
- default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
- break;
- }
-}
-
-static GstFlowReturn
-gst_two_lame_flush_full (GstTwoLame * lame, gboolean push)
-{
- GstBuffer *buf;
- GstMapInfo map;
- gint size;
- GstFlowReturn result = GST_FLOW_OK;
-
- if (!lame->glopts)
- return GST_FLOW_OK;
-
- buf = gst_buffer_new_and_alloc (16384);
- gst_buffer_map (buf, &map, GST_MAP_WRITE);
- size = twolame_encode_flush (lame->glopts, map.data, 16384);
- gst_buffer_unmap (buf, &map);
-
- if (size > 0 && push) {
- gst_buffer_set_size (buf, size);
- GST_DEBUG_OBJECT (lame, "pushing final packet of %u bytes", size);
- result = gst_audio_encoder_finish_frame (GST_AUDIO_ENCODER (lame), buf, -1);
- } else {
- GST_DEBUG_OBJECT (lame, "no final packet (size=%d, push=%d)", size, push);
- gst_buffer_unref (buf);
- result = GST_FLOW_OK;
- }
- return result;
-}
-
-static void
-gst_two_lame_flush (GstAudioEncoder * enc)
-{
- gst_two_lame_flush_full (GST_TWO_LAME (enc), FALSE);
-}
-
-static GstFlowReturn
-gst_two_lame_handle_frame (GstAudioEncoder * enc, GstBuffer * buf)
-{
- GstTwoLame *twolame;
- gint mp3_buffer_size, mp3_size;
- GstBuffer *mp3_buf;
- GstFlowReturn result;
- gint num_samples;
- GstMapInfo map, mp3_map;
-
- twolame = GST_TWO_LAME (enc);
-
- /* squeeze remaining and push */
- if (G_UNLIKELY (buf == NULL))
- return gst_two_lame_flush_full (twolame, TRUE);
-
- gst_buffer_map (buf, &map, GST_MAP_READ);
-
- if (twolame->float_input)
- num_samples = map.size / 4;
- else
- num_samples = map.size / 2;
-
- /* allocate space for output */
- mp3_buffer_size = 1.25 * num_samples + 16384;
- mp3_buf = gst_buffer_new_and_alloc (mp3_buffer_size);
- gst_buffer_map (mp3_buf, &mp3_map, GST_MAP_WRITE);
-
- if (twolame->num_channels == 1) {
- if (twolame->float_input)
- mp3_size = twolame_encode_buffer_float32 (twolame->glopts,
- (float *) map.data,
- (float *) map.data, num_samples, mp3_map.data, mp3_buffer_size);
- else
- mp3_size = twolame_encode_buffer (twolame->glopts,
- (short int *) map.data,
- (short int *) map.data, num_samples, mp3_map.data, mp3_buffer_size);
- } else {
- if (twolame->float_input)
- mp3_size = twolame_encode_buffer_float32_interleaved (twolame->glopts,
- (float *) map.data,
- num_samples / twolame->num_channels, mp3_map.data, mp3_buffer_size);
- else
- mp3_size = twolame_encode_buffer_interleaved (twolame->glopts,
- (short int *) map.data,
- num_samples / twolame->num_channels, mp3_map.data, mp3_buffer_size);
- }
-
- GST_LOG_OBJECT (twolame, "encoded %" G_GSIZE_FORMAT " bytes of audio "
- "to %d bytes of mp3", map.size, mp3_size);
-
- gst_buffer_unmap (buf, &map);
- gst_buffer_unmap (mp3_buf, &mp3_map);
-
- if (mp3_size > 0) {
- gst_buffer_set_size (mp3_buf, mp3_size);
- result = gst_audio_encoder_finish_frame (enc, mp3_buf, -1);
- } else {
- if (mp3_size < 0) {
- /* eat error ? */
- g_warning ("error %d", mp3_size);
- }
- gst_buffer_unref (mp3_buf);
- result = GST_FLOW_OK;
- }
-
- return result;
-}
-
-/* set up the encoder state */
-static gboolean
-gst_two_lame_setup (GstTwoLame * twolame)
-{
-
-#define CHECK_ERROR(command) G_STMT_START {\
- if ((command) < 0) { \
- GST_ERROR_OBJECT (twolame, "setup failed: " G_STRINGIFY (command)); \
- return FALSE; \
- } \
-}G_STMT_END
-
- int retval;
- GstCaps *allowed_caps;
-
- GST_DEBUG_OBJECT (twolame, "starting setup");
-
- /* check if we're already setup; if we are, we might want to check
- * if this initialization is compatible with the previous one */
- /* FIXME: do this */
- if (twolame->setup) {
- GST_WARNING_OBJECT (twolame, "already setup");
- twolame->setup = FALSE;
- }
-
- twolame->glopts = twolame_init ();
-
- if (twolame->glopts == NULL)
- return FALSE;
-
- /* copy the parameters over */
- twolame_set_in_samplerate (twolame->glopts, twolame->samplerate);
-
- /* let twolame choose default samplerate unless outgoing sample rate is fixed */
- allowed_caps = gst_pad_get_allowed_caps (GST_AUDIO_ENCODER_SRC_PAD (twolame));
-
- if (allowed_caps != NULL) {
- GstStructure *structure;
- gint samplerate;
-
- structure = gst_caps_get_structure (allowed_caps, 0);
-
- if (gst_structure_get_int (structure, "rate", &samplerate)) {
- GST_DEBUG_OBJECT (twolame,
- "Setting sample rate to %d as fixed in src caps", samplerate);
- twolame_set_out_samplerate (twolame->glopts, samplerate);
- } else {
- GST_DEBUG_OBJECT (twolame, "Letting twolame choose sample rate");
- twolame_set_out_samplerate (twolame->glopts, 0);
- }
- gst_caps_unref (allowed_caps);
- allowed_caps = NULL;
- } else {
- GST_DEBUG_OBJECT (twolame,
- "No peer yet, letting twolame choose sample rate");
- twolame_set_out_samplerate (twolame->glopts, 0);
- }
-
- /* force mono encoding if we only have one channel */
- if (twolame->num_channels == 1)
- twolame->mode = 3;
-
- /* Fix bitrates and MPEG version */
-
- CHECK_ERROR (twolame_set_num_channels (twolame->glopts,
- twolame->num_channels));
-
- CHECK_ERROR (twolame_set_mode (twolame->glopts, twolame->mode));
- CHECK_ERROR (twolame_set_psymodel (twolame->glopts, twolame->psymodel));
- CHECK_AND_FIXUP_BITRATE (twolame, "bitrate", twolame->bitrate);
- CHECK_ERROR (twolame_set_bitrate (twolame->glopts, twolame->bitrate));
- CHECK_ERROR (twolame_set_padding (twolame->glopts, twolame->padding));
- CHECK_ERROR (twolame_set_energy_levels (twolame->glopts,
- twolame->energy_level_extension));
- CHECK_ERROR (twolame_set_emphasis (twolame->glopts, twolame->emphasis));
- CHECK_ERROR (twolame_set_error_protection (twolame->glopts,
- twolame->error_protection));
- CHECK_ERROR (twolame_set_copyright (twolame->glopts, twolame->copyright));
- CHECK_ERROR (twolame_set_original (twolame->glopts, twolame->original));
- CHECK_ERROR (twolame_set_VBR (twolame->glopts, twolame->vbr));
- CHECK_ERROR (twolame_set_VBR_level (twolame->glopts, twolame->vbr_level));
- CHECK_ERROR (twolame_set_ATH_level (twolame->glopts, twolame->ath_level));
- CHECK_AND_FIXUP_BITRATE (twolame, "vbr-max-bitrate",
- twolame->vbr_max_bitrate);
- CHECK_ERROR (twolame_set_VBR_max_bitrate_kbps (twolame->glopts,
- twolame->vbr_max_bitrate));
- CHECK_ERROR (twolame_set_quick_mode (twolame->glopts, twolame->quick_mode));
- CHECK_ERROR (twolame_set_quick_count (twolame->glopts,
- twolame->quick_mode_count));
-
- /* initialize the twolame encoder */
- if ((retval = twolame_init_params (twolame->glopts)) >= 0) {
- twolame->setup = TRUE;
- /* FIXME: it would be nice to print out the mode here */
- GST_INFO ("twolame encoder setup (%d kbit/s, %d Hz, %d channels)",
- twolame->bitrate, twolame->samplerate, twolame->num_channels);
- } else {
- GST_ERROR_OBJECT (twolame, "twolame_init_params returned %d", retval);
- }
-
- GST_DEBUG_OBJECT (twolame, "done with setup");
-
- return twolame->setup;
-#undef CHECK_ERROR
-}
-
-static gboolean
-gst_two_lame_get_default_settings (void)
-{
- twolame_options *glopts = NULL;
-
- glopts = twolame_init ();
- if (glopts == NULL) {
- GST_ERROR ("Couldn't initialize TwoLAME");
- return FALSE;
- }
-
- twolame_set_num_channels (glopts, 2);
- twolame_set_in_samplerate (glopts, 44100);
-
- if (twolame_init_params (glopts) != 0) {
- GST_ERROR ("Couldn't set default parameters");
- return FALSE;
- }
-
- gst_two_lame_default_settings.mode = TWOLAME_JOINT_STEREO; /* twolame_get_mode (glopts); */
- gst_two_lame_default_settings.psymodel = twolame_get_psymodel (glopts);
- gst_two_lame_default_settings.bitrate = twolame_get_bitrate (glopts);
- gst_two_lame_default_settings.padding = twolame_get_padding (glopts);
- gst_two_lame_default_settings.energy_level_extension =
- twolame_get_energy_levels (glopts);
- gst_two_lame_default_settings.emphasis = twolame_get_emphasis (glopts);
- gst_two_lame_default_settings.error_protection =
- twolame_get_error_protection (glopts);
- gst_two_lame_default_settings.copyright = twolame_get_copyright (glopts);
- gst_two_lame_default_settings.original = twolame_get_original (glopts);
- gst_two_lame_default_settings.vbr = twolame_get_VBR (glopts);
- gst_two_lame_default_settings.vbr_level = twolame_get_VBR_level (glopts);
- gst_two_lame_default_settings.ath_level = twolame_get_ATH_level (glopts);
- gst_two_lame_default_settings.vbr_max_bitrate =
- twolame_get_VBR_max_bitrate_kbps (glopts);
- gst_two_lame_default_settings.quick_mode = twolame_get_quick_mode (glopts);
- gst_two_lame_default_settings.quick_mode_count =
- twolame_get_quick_count (glopts);
-
- twolame_close (&glopts);
-
- return TRUE;
-}
-
-static gboolean
-plugin_init (GstPlugin * plugin)
-{
- GST_DEBUG_CATEGORY_INIT (debug, "twolame", 0, "twolame mp2 encoder");
-
- if (!gst_two_lame_get_default_settings ())
- return FALSE;
-
-#ifdef ENABLE_NLS
- GST_DEBUG ("binding text domain %s to locale dir %s", GETTEXT_PACKAGE,
- LOCALEDIR);
- bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
- bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
-#endif /* ENABLE_NLS */
-
- if (!gst_element_register (plugin, "twolamemp2enc", GST_RANK_PRIMARY,
- GST_TYPE_TWO_LAME))
- return FALSE;
-
- return TRUE;
-}
-
-GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
- GST_VERSION_MINOR,
- twolame,
- "Encode MP2s with TwoLAME",
- plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN);
diff --git a/ext/twolame/gsttwolamemp2enc.h b/ext/twolame/gsttwolamemp2enc.h
deleted file mode 100644
index 72a6bea..0000000
--- a/ext/twolame/gsttwolamemp2enc.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/* GStreamer
- * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu>
- * Copyright (C) <2008> Sebastian Dröge <sebastian.droege@collabora.co.uk>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-
-#ifndef __GST_TWO_LAME_H__
-#define __GST_TWO_LAME_H__
-
-
-#include <gst/gst.h>
-#include <gst/audio/gstaudioencoder.h>
-
-G_BEGIN_DECLS
-
-#include <twolame.h>
-
-#define GST_TYPE_TWO_LAME \
- (gst_two_lame_get_type())
-#define GST_TWO_LAME(obj) \
- (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_TWO_LAME,GstTwoLame))
-#define GST_TWO_LAME_CLASS(klass) \
- (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_TWO_LAME,GstTwoLameClass))
-#define GST_IS_TWO_LAME(obj) \
- (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_TWO_LAME))
-#define GST_IS_TWO_LAME_CLASS(klass) \
- (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_TWO_LAME))
-
-typedef struct _GstTwoLame GstTwoLame;
-typedef struct _GstTwoLameClass GstTwoLameClass;
-
-/**
- * GstTwoLame:
- *
- * Opaque data structure.
- */
-struct _GstTwoLame {
- GstAudioEncoder element;
-
- gint samplerate;
- gint num_channels;
- gboolean float_input;
- gboolean setup;
-
- gint mode;
- gint psymodel;
- gint bitrate;
- gint padding;
- gboolean energy_level_extension;
- gint emphasis;
- gboolean error_protection;
- gboolean copyright;
- gboolean original;
- gboolean vbr;
- gfloat vbr_level;
- gfloat ath_level;
- gint vbr_max_bitrate;
- gboolean quick_mode;
- gint quick_mode_count;
-
- twolame_options *glopts;
-};
-
-struct _GstTwoLameClass {
- GstAudioEncoderClass parent_class;
-};
-
-GType gst_two_lame_get_type(void);
-
-G_END_DECLS
-
-
-#endif /* __GST_TWO_LAME_H__ */
diff --git a/ext/twolame/meson.build b/ext/twolame/meson.build
deleted file mode 100644
index 029a00e..0000000
--- a/ext/twolame/meson.build
+++ /dev/null
@@ -1,12 +0,0 @@
-twolame_dep = dependency('twolame', version : '>= 0.3.10', required : false)
-
-if twolame_dep.found()
- twolame = library('gsttwolame',
- ['gsttwolamemp2enc.c'],
- c_args : ugly_args,
- include_directories : [configinc, libsinc],
- dependencies : [gstaudio_dep, twolame_dep],
- install : true,
- install_dir : plugins_install_dir,
- )
-endif
diff --git a/ext/x264/Makefile.am b/ext/x264/Makefile.am
index 0866d64..d2287eb 100644
--- a/ext/x264/Makefile.am
+++ b/ext/x264/Makefile.am
@@ -13,7 +13,6 @@
$(X264_LIBS) \
$(GMODULE_NO_EXPORT_LIBS)
libgstx264_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstx264_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
noinst_HEADERS = gstx264enc.h
diff --git a/ext/x264/Makefile.in b/ext/x264/Makefile.in
index faf1dff..a62b1ce 100644
--- a/ext/x264/Makefile.in
+++ b/ext/x264/Makefile.in
@@ -171,10 +171,9 @@
am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
am__v_lt_0 = --silent
am__v_lt_1 =
-libgstx264_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
- $(libgstx264_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
- $(CCLD) $(libgstx264_la_CFLAGS) $(CFLAGS) \
- $(libgstx264_la_LDFLAGS) $(LDFLAGS) -o $@
+libgstx264_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(libgstx264_la_CFLAGS) \
+ $(CFLAGS) $(libgstx264_la_LDFLAGS) $(LDFLAGS) -o $@
AM_V_P = $(am__v_P_@AM_V@)
am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
am__v_P_0 = false
@@ -287,6 +286,7 @@
ERROR_CFLAGS = @ERROR_CFLAGS@
ERROR_CXXFLAGS = @ERROR_CXXFLAGS@
EXEEXT = @EXEEXT@
+EXTRA_CFLAGS = @EXTRA_CFLAGS@
FFLAGS = @FFLAGS@
FGREP = @FGREP@
GCOV = @GCOV@
@@ -338,7 +338,6 @@
GST_PLUGINS_NONPORTED = @GST_PLUGINS_NONPORTED@
GST_PLUGINS_SELECTED = @GST_PLUGINS_SELECTED@
GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
-GST_PLUGIN_LIBTOOLFLAGS = @GST_PLUGIN_LIBTOOLFLAGS@
GST_PREFIX = @GST_PREFIX@
GST_REVISION = @GST_REVISION@
GST_TOOLS_DIR = @GST_TOOLS_DIR@
@@ -349,7 +348,6 @@
GTKDOC_REBASE = @GTKDOC_REBASE@
HAVE_CXX = @HAVE_CXX@
HAVE_DVDREAD = @HAVE_DVDREAD@
-HAVE_LAME = @HAVE_LAME@
HTML_DIR = @HTML_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
@@ -358,8 +356,6 @@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INTLLIBS = @INTLLIBS@
INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-LAME_CFLAGS = @LAME_CFLAGS@
-LAME_LIBS = @LAME_LIBS@
LD = @LD@
LDFLAGS = @LDFLAGS@
LIBICONV = @LIBICONV@
@@ -381,8 +377,6 @@
MKDIR_P = @MKDIR_P@
MPEG2DEC_CFLAGS = @MPEG2DEC_CFLAGS@
MPEG2DEC_LIBS = @MPEG2DEC_LIBS@
-MPG123_CFLAGS = @MPG123_CFLAGS@
-MPG123_LIBS = @MPG123_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_015 = @MSGFMT_015@
MSGMERGE = @MSGMERGE@
@@ -425,13 +419,13 @@
SIDPLAY_CFLAGS = @SIDPLAY_CFLAGS@
SIDPLAY_LIBS = @SIDPLAY_LIBS@
STRIP = @STRIP@
-TWOLAME_CFLAGS = @TWOLAME_CFLAGS@
-TWOLAME_LIBS = @TWOLAME_LIBS@
USE_NLS = @USE_NLS@
VALGRIND_CFLAGS = @VALGRIND_CFLAGS@
VALGRIND_LIBS = @VALGRIND_LIBS@
VALGRIND_PATH = @VALGRIND_PATH@
VERSION = @VERSION@
+VISIBILITY_CFLAGS = @VISIBILITY_CFLAGS@
+VISIBILITY_CXXFLAGS = @VISIBILITY_CXXFLAGS@
WARNING_CFLAGS = @WARNING_CFLAGS@
WARNING_CXXFLAGS = @WARNING_CXXFLAGS@
WIN32_LIBS = @WIN32_LIBS@
@@ -519,7 +513,6 @@
$(GMODULE_NO_EXPORT_LIBS)
libgstx264_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstx264_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
noinst_HEADERS = gstx264enc.h
presetdir = $(datadir)/gstreamer-$(GST_API_VERSION)/presets
preset_DATA = GstX264Enc.prs
@@ -629,11 +622,11 @@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
libgstx264_la-gstx264enc.lo: gstx264enc.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstx264_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstx264_la_CFLAGS) $(CFLAGS) -MT libgstx264_la-gstx264enc.lo -MD -MP -MF $(DEPDIR)/libgstx264_la-gstx264enc.Tpo -c -o libgstx264_la-gstx264enc.lo `test -f 'gstx264enc.c' || echo '$(srcdir)/'`gstx264enc.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstx264_la_CFLAGS) $(CFLAGS) -MT libgstx264_la-gstx264enc.lo -MD -MP -MF $(DEPDIR)/libgstx264_la-gstx264enc.Tpo -c -o libgstx264_la-gstx264enc.lo `test -f 'gstx264enc.c' || echo '$(srcdir)/'`gstx264enc.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstx264_la-gstx264enc.Tpo $(DEPDIR)/libgstx264_la-gstx264enc.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gstx264enc.c' object='libgstx264_la-gstx264enc.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstx264_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstx264_la_CFLAGS) $(CFLAGS) -c -o libgstx264_la-gstx264enc.lo `test -f 'gstx264enc.c' || echo '$(srcdir)/'`gstx264enc.c
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstx264_la_CFLAGS) $(CFLAGS) -c -o libgstx264_la-gstx264enc.lo `test -f 'gstx264enc.c' || echo '$(srcdir)/'`gstx264enc.c
mostlyclean-libtool:
-rm -f *.lo
diff --git a/ext/x264/gstx264enc.c b/ext/x264/gstx264enc.c
index 4287cf9..3d3e0be 100644
--- a/ext/x264/gstx264enc.c
+++ b/ext/x264/gstx264enc.c
@@ -367,6 +367,7 @@
ARG_PSY_TUNE,
ARG_TUNE,
ARG_FRAME_PACKING,
+ ARG_INSERT_VUI,
};
#define ARG_THREADS_DEFAULT 0 /* 0 means 'auto' which is 1.5x number of CPU cores */
@@ -408,6 +409,7 @@
#define ARG_PSY_TUNE_DEFAULT 0 /* no psy tuning */
#define ARG_TUNE_DEFAULT 0 /* no tuning */
#define ARG_FRAME_PACKING_DEFAULT -1 /* automatic (none, or from input caps) */
+#define ARG_INSERT_VUI_DEFAULT TRUE
enum
{
@@ -938,6 +940,11 @@
GST_X264_ENC_FRAME_PACKING_TYPE, ARG_FRAME_PACKING_DEFAULT,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+ g_object_class_install_property (gobject_class, ARG_INSERT_VUI,
+ g_param_spec_boolean ("insert-vui", "Insert VUI",
+ "Insert VUI NAL in stream",
+ ARG_INSERT_VUI_DEFAULT, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+
/* options for which we _do_ use string equivalents */
g_object_class_install_property (gobject_class, ARG_THREADS,
g_param_spec_uint ("threads", "Threads",
@@ -1015,7 +1022,7 @@
g_object_class_install_property (gobject_class, ARG_BFRAMES,
g_param_spec_uint ("bframes", "B-Frames",
"Number of B-frames between I and P",
- 0, 4, ARG_BFRAMES_DEFAULT,
+ 0, 16, ARG_BFRAMES_DEFAULT,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
g_string_append_printf (x264enc_defaults, ":bframes=%d", ARG_BFRAMES_DEFAULT);
g_object_class_install_property (gobject_class, ARG_B_ADAPT,
@@ -1223,6 +1230,7 @@
encoder->psy_tune = ARG_PSY_TUNE_DEFAULT;
encoder->tune = ARG_TUNE_DEFAULT;
encoder->frame_packing = ARG_FRAME_PACKING_DEFAULT;
+ encoder->insert_vui = ARG_INSERT_VUI_DEFAULT;
}
typedef struct
@@ -1586,6 +1594,9 @@
encoder->x264param.vui.i_vidformat = 5; /* unspecified */
}
+ if (!encoder->insert_vui)
+ goto skip_vui_parameters;
+
switch (info->colorimetry.primaries) {
case GST_VIDEO_COLOR_PRIMARIES_BT709:
encoder->x264param.vui.i_colorprim = 1;
@@ -1689,9 +1700,18 @@
break;
}
+skip_vui_parameters:
encoder->x264param.analyse.b_psnr = 0;
+ /* FIXME 2.0 make configuration more sane and consistent with x264 cmdline:
+ * + split pass property into a pass property (pass1/2/3 enum) and rc-method
+ * + bitrate property should only be used in case of CBR method
+ * + vbv bitrate/buffer should have separate configuration that is then
+ * applied independently of the mode:
+ * + either using properties (new) vbv-maxrate and (renamed) vbv-bufsize
+ * + or dropping vbv-buf-capacity altogether and simply using option-string
+ */
switch (encoder->pass) {
case GST_X264_ENC_PASS_QUANT:
encoder->x264param.rc.i_rc_method = X264_RC_CQP;
@@ -2206,6 +2226,7 @@
"downstream has ANY caps, outputting byte-stream");
encoder->current_byte_stream = GST_X264_ENC_STREAM_FORMAT_BYTE_STREAM;
g_string_append_printf (encoder->option_string, ":annexb=1");
+ gst_caps_unref (allowed_caps);
} else if (allowed_caps) {
GstStructure *s;
const gchar *profile;
@@ -2739,6 +2760,9 @@
case ARG_FRAME_PACKING:
encoder->frame_packing = g_value_get_enum (value);
break;
+ case ARG_INSERT_VUI:
+ encoder->insert_vui = g_value_get_boolean (value);
+ break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
@@ -2878,6 +2902,9 @@
case ARG_FRAME_PACKING:
g_value_set_enum (value, encoder->frame_packing);
break;
+ case ARG_INSERT_VUI:
+ g_value_set_boolean (value, encoder->insert_vui);
+ break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
@@ -2904,11 +2931,13 @@
default_vtable.x264_encoder_encode = x264_encoder_encode;
default_vtable.x264_encoder_headers = x264_encoder_headers;
default_vtable.x264_encoder_intra_refresh = x264_encoder_intra_refresh;
- default_vtable.x264_encoder_maximum_delayed_frames = x264_encoder_maximum_delayed_frames;
+ default_vtable.x264_encoder_maximum_delayed_frames =
+ x264_encoder_maximum_delayed_frames;
default_vtable.x264_encoder_open = x264_encoder_open;
default_vtable.x264_encoder_reconfig = x264_encoder_reconfig;
default_vtable.x264_levels = &x264_levels;
- default_vtable.x264_param_apply_fastfirstpass = x264_param_apply_fastfirstpass;
+ default_vtable.x264_param_apply_fastfirstpass =
+ x264_param_apply_fastfirstpass;
default_vtable.x264_param_apply_profile = x264_param_apply_profile;
default_vtable.x264_param_default = x264_param_default;
default_vtable.x264_param_default_preset = x264_param_default_preset;
diff --git a/ext/x264/gstx264enc.h b/ext/x264/gstx264enc.h
index 6f4ad48..e8291a3 100644
--- a/ext/x264/gstx264enc.h
+++ b/ext/x264/gstx264enc.h
@@ -111,6 +111,7 @@
GString *option_string_prop; /* option-string property */
GString *option_string; /* used by set prop */
gint frame_packing;
+ gboolean insert_vui;
/* input description */
GstVideoCodecState *input_state;
diff --git a/gst-libs/Makefile.in b/gst-libs/Makefile.in
index 3ba58de..a437563 100644
--- a/gst-libs/Makefile.in
+++ b/gst-libs/Makefile.in
@@ -258,6 +258,7 @@
ERROR_CFLAGS = @ERROR_CFLAGS@
ERROR_CXXFLAGS = @ERROR_CXXFLAGS@
EXEEXT = @EXEEXT@
+EXTRA_CFLAGS = @EXTRA_CFLAGS@
FFLAGS = @FFLAGS@
FGREP = @FGREP@
GCOV = @GCOV@
@@ -309,7 +310,6 @@
GST_PLUGINS_NONPORTED = @GST_PLUGINS_NONPORTED@
GST_PLUGINS_SELECTED = @GST_PLUGINS_SELECTED@
GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
-GST_PLUGIN_LIBTOOLFLAGS = @GST_PLUGIN_LIBTOOLFLAGS@
GST_PREFIX = @GST_PREFIX@
GST_REVISION = @GST_REVISION@
GST_TOOLS_DIR = @GST_TOOLS_DIR@
@@ -320,7 +320,6 @@
GTKDOC_REBASE = @GTKDOC_REBASE@
HAVE_CXX = @HAVE_CXX@
HAVE_DVDREAD = @HAVE_DVDREAD@
-HAVE_LAME = @HAVE_LAME@
HTML_DIR = @HTML_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
@@ -329,8 +328,6 @@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INTLLIBS = @INTLLIBS@
INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-LAME_CFLAGS = @LAME_CFLAGS@
-LAME_LIBS = @LAME_LIBS@
LD = @LD@
LDFLAGS = @LDFLAGS@
LIBICONV = @LIBICONV@
@@ -352,8 +349,6 @@
MKDIR_P = @MKDIR_P@
MPEG2DEC_CFLAGS = @MPEG2DEC_CFLAGS@
MPEG2DEC_LIBS = @MPEG2DEC_LIBS@
-MPG123_CFLAGS = @MPG123_CFLAGS@
-MPG123_LIBS = @MPG123_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_015 = @MSGFMT_015@
MSGMERGE = @MSGMERGE@
@@ -396,13 +391,13 @@
SIDPLAY_CFLAGS = @SIDPLAY_CFLAGS@
SIDPLAY_LIBS = @SIDPLAY_LIBS@
STRIP = @STRIP@
-TWOLAME_CFLAGS = @TWOLAME_CFLAGS@
-TWOLAME_LIBS = @TWOLAME_LIBS@
USE_NLS = @USE_NLS@
VALGRIND_CFLAGS = @VALGRIND_CFLAGS@
VALGRIND_LIBS = @VALGRIND_LIBS@
VALGRIND_PATH = @VALGRIND_PATH@
VERSION = @VERSION@
+VISIBILITY_CFLAGS = @VISIBILITY_CFLAGS@
+VISIBILITY_CXXFLAGS = @VISIBILITY_CXXFLAGS@
WARNING_CFLAGS = @WARNING_CFLAGS@
WARNING_CXXFLAGS = @WARNING_CXXFLAGS@
WIN32_LIBS = @WIN32_LIBS@
diff --git a/gst-libs/gst/Makefile.in b/gst-libs/gst/Makefile.in
index 2084d9a..335c187 100644
--- a/gst-libs/gst/Makefile.in
+++ b/gst-libs/gst/Makefile.in
@@ -219,6 +219,7 @@
ERROR_CFLAGS = @ERROR_CFLAGS@
ERROR_CXXFLAGS = @ERROR_CXXFLAGS@
EXEEXT = @EXEEXT@
+EXTRA_CFLAGS = @EXTRA_CFLAGS@
FFLAGS = @FFLAGS@
FGREP = @FGREP@
GCOV = @GCOV@
@@ -270,7 +271,6 @@
GST_PLUGINS_NONPORTED = @GST_PLUGINS_NONPORTED@
GST_PLUGINS_SELECTED = @GST_PLUGINS_SELECTED@
GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
-GST_PLUGIN_LIBTOOLFLAGS = @GST_PLUGIN_LIBTOOLFLAGS@
GST_PREFIX = @GST_PREFIX@
GST_REVISION = @GST_REVISION@
GST_TOOLS_DIR = @GST_TOOLS_DIR@
@@ -281,7 +281,6 @@
GTKDOC_REBASE = @GTKDOC_REBASE@
HAVE_CXX = @HAVE_CXX@
HAVE_DVDREAD = @HAVE_DVDREAD@
-HAVE_LAME = @HAVE_LAME@
HTML_DIR = @HTML_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
@@ -290,8 +289,6 @@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INTLLIBS = @INTLLIBS@
INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-LAME_CFLAGS = @LAME_CFLAGS@
-LAME_LIBS = @LAME_LIBS@
LD = @LD@
LDFLAGS = @LDFLAGS@
LIBICONV = @LIBICONV@
@@ -313,8 +310,6 @@
MKDIR_P = @MKDIR_P@
MPEG2DEC_CFLAGS = @MPEG2DEC_CFLAGS@
MPEG2DEC_LIBS = @MPEG2DEC_LIBS@
-MPG123_CFLAGS = @MPG123_CFLAGS@
-MPG123_LIBS = @MPG123_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_015 = @MSGFMT_015@
MSGMERGE = @MSGMERGE@
@@ -357,13 +352,13 @@
SIDPLAY_CFLAGS = @SIDPLAY_CFLAGS@
SIDPLAY_LIBS = @SIDPLAY_LIBS@
STRIP = @STRIP@
-TWOLAME_CFLAGS = @TWOLAME_CFLAGS@
-TWOLAME_LIBS = @TWOLAME_LIBS@
USE_NLS = @USE_NLS@
VALGRIND_CFLAGS = @VALGRIND_CFLAGS@
VALGRIND_LIBS = @VALGRIND_LIBS@
VALGRIND_PATH = @VALGRIND_PATH@
VERSION = @VERSION@
+VISIBILITY_CFLAGS = @VISIBILITY_CFLAGS@
+VISIBILITY_CXXFLAGS = @VISIBILITY_CXXFLAGS@
WARNING_CFLAGS = @WARNING_CFLAGS@
WARNING_CXXFLAGS = @WARNING_CXXFLAGS@
WIN32_LIBS = @WIN32_LIBS@
diff --git a/gst-plugins-ugly.doap b/gst-plugins-ugly.doap
index 73662c3..ca6d922 100644
--- a/gst-plugins-ugly.doap
+++ b/gst-plugins-ugly.doap
@@ -35,6 +35,16 @@
<release>
<Version>
+ <revision>1.13.1</revision>
+ <branch>master</branch>
+ <name></name>
+ <created>2018-02-15</created>
+ <file-release rdf:resource="http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.13.1.tar.xz" />
+ </Version>
+ </release>
+
+ <release>
+ <Version>
<revision>1.12.4</revision>
<branch>1.12</branch>
<name></name>
diff --git a/gst/Makefile.in b/gst/Makefile.in
index 5ce8fa9..18fe9a0 100644
--- a/gst/Makefile.in
+++ b/gst/Makefile.in
@@ -263,6 +263,7 @@
ERROR_CFLAGS = @ERROR_CFLAGS@
ERROR_CXXFLAGS = @ERROR_CXXFLAGS@
EXEEXT = @EXEEXT@
+EXTRA_CFLAGS = @EXTRA_CFLAGS@
FFLAGS = @FFLAGS@
FGREP = @FGREP@
GCOV = @GCOV@
@@ -314,7 +315,6 @@
GST_PLUGINS_NONPORTED = @GST_PLUGINS_NONPORTED@
GST_PLUGINS_SELECTED = @GST_PLUGINS_SELECTED@
GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
-GST_PLUGIN_LIBTOOLFLAGS = @GST_PLUGIN_LIBTOOLFLAGS@
GST_PREFIX = @GST_PREFIX@
GST_REVISION = @GST_REVISION@
GST_TOOLS_DIR = @GST_TOOLS_DIR@
@@ -325,7 +325,6 @@
GTKDOC_REBASE = @GTKDOC_REBASE@
HAVE_CXX = @HAVE_CXX@
HAVE_DVDREAD = @HAVE_DVDREAD@
-HAVE_LAME = @HAVE_LAME@
HTML_DIR = @HTML_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
@@ -334,8 +333,6 @@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INTLLIBS = @INTLLIBS@
INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-LAME_CFLAGS = @LAME_CFLAGS@
-LAME_LIBS = @LAME_LIBS@
LD = @LD@
LDFLAGS = @LDFLAGS@
LIBICONV = @LIBICONV@
@@ -357,8 +354,6 @@
MKDIR_P = @MKDIR_P@
MPEG2DEC_CFLAGS = @MPEG2DEC_CFLAGS@
MPEG2DEC_LIBS = @MPEG2DEC_LIBS@
-MPG123_CFLAGS = @MPG123_CFLAGS@
-MPG123_LIBS = @MPG123_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_015 = @MSGFMT_015@
MSGMERGE = @MSGMERGE@
@@ -401,13 +396,13 @@
SIDPLAY_CFLAGS = @SIDPLAY_CFLAGS@
SIDPLAY_LIBS = @SIDPLAY_LIBS@
STRIP = @STRIP@
-TWOLAME_CFLAGS = @TWOLAME_CFLAGS@
-TWOLAME_LIBS = @TWOLAME_LIBS@
USE_NLS = @USE_NLS@
VALGRIND_CFLAGS = @VALGRIND_CFLAGS@
VALGRIND_LIBS = @VALGRIND_LIBS@
VALGRIND_PATH = @VALGRIND_PATH@
VERSION = @VERSION@
+VISIBILITY_CFLAGS = @VISIBILITY_CFLAGS@
+VISIBILITY_CXXFLAGS = @VISIBILITY_CXXFLAGS@
WARNING_CFLAGS = @WARNING_CFLAGS@
WARNING_CXXFLAGS = @WARNING_CXXFLAGS@
WIN32_LIBS = @WIN32_LIBS@
diff --git a/gst/asfdemux/Makefile.am b/gst/asfdemux/Makefile.am
index ede3532..dcc7b27 100644
--- a/gst/asfdemux/Makefile.am
+++ b/gst/asfdemux/Makefile.am
@@ -9,6 +9,5 @@
$(GST_BASE_LIBS) $(GST_LIBS) \
$(WIN32_LIBS)
libgstasf_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstasf_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
noinst_HEADERS = gstasfdemux.h asfheaders.h asfpacket.h gstrtpasfdepay.h gstrtspwms.h
diff --git a/gst/asfdemux/Makefile.in b/gst/asfdemux/Makefile.in
index 2bc38e3..faf9f7e 100644
--- a/gst/asfdemux/Makefile.in
+++ b/gst/asfdemux/Makefile.in
@@ -173,10 +173,9 @@
am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
am__v_lt_0 = --silent
am__v_lt_1 =
-libgstasf_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
- $(libgstasf_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
- $(CCLD) $(libgstasf_la_CFLAGS) $(CFLAGS) \
- $(libgstasf_la_LDFLAGS) $(LDFLAGS) -o $@
+libgstasf_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(libgstasf_la_CFLAGS) \
+ $(CFLAGS) $(libgstasf_la_LDFLAGS) $(LDFLAGS) -o $@
AM_V_P = $(am__v_P_@AM_V@)
am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
am__v_P_0 = false
@@ -288,6 +287,7 @@
ERROR_CFLAGS = @ERROR_CFLAGS@
ERROR_CXXFLAGS = @ERROR_CXXFLAGS@
EXEEXT = @EXEEXT@
+EXTRA_CFLAGS = @EXTRA_CFLAGS@
FFLAGS = @FFLAGS@
FGREP = @FGREP@
GCOV = @GCOV@
@@ -339,7 +339,6 @@
GST_PLUGINS_NONPORTED = @GST_PLUGINS_NONPORTED@
GST_PLUGINS_SELECTED = @GST_PLUGINS_SELECTED@
GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
-GST_PLUGIN_LIBTOOLFLAGS = @GST_PLUGIN_LIBTOOLFLAGS@
GST_PREFIX = @GST_PREFIX@
GST_REVISION = @GST_REVISION@
GST_TOOLS_DIR = @GST_TOOLS_DIR@
@@ -350,7 +349,6 @@
GTKDOC_REBASE = @GTKDOC_REBASE@
HAVE_CXX = @HAVE_CXX@
HAVE_DVDREAD = @HAVE_DVDREAD@
-HAVE_LAME = @HAVE_LAME@
HTML_DIR = @HTML_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
@@ -359,8 +357,6 @@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INTLLIBS = @INTLLIBS@
INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-LAME_CFLAGS = @LAME_CFLAGS@
-LAME_LIBS = @LAME_LIBS@
LD = @LD@
LDFLAGS = @LDFLAGS@
LIBICONV = @LIBICONV@
@@ -382,8 +378,6 @@
MKDIR_P = @MKDIR_P@
MPEG2DEC_CFLAGS = @MPEG2DEC_CFLAGS@
MPEG2DEC_LIBS = @MPEG2DEC_LIBS@
-MPG123_CFLAGS = @MPG123_CFLAGS@
-MPG123_LIBS = @MPG123_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_015 = @MSGFMT_015@
MSGMERGE = @MSGMERGE@
@@ -426,13 +420,13 @@
SIDPLAY_CFLAGS = @SIDPLAY_CFLAGS@
SIDPLAY_LIBS = @SIDPLAY_LIBS@
STRIP = @STRIP@
-TWOLAME_CFLAGS = @TWOLAME_CFLAGS@
-TWOLAME_LIBS = @TWOLAME_LIBS@
USE_NLS = @USE_NLS@
VALGRIND_CFLAGS = @VALGRIND_CFLAGS@
VALGRIND_LIBS = @VALGRIND_LIBS@
VALGRIND_PATH = @VALGRIND_PATH@
VERSION = @VERSION@
+VISIBILITY_CFLAGS = @VISIBILITY_CFLAGS@
+VISIBILITY_CXXFLAGS = @VISIBILITY_CXXFLAGS@
WARNING_CFLAGS = @WARNING_CFLAGS@
WARNING_CXXFLAGS = @WARNING_CXXFLAGS@
WIN32_LIBS = @WIN32_LIBS@
@@ -515,7 +509,6 @@
$(WIN32_LIBS)
libgstasf_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstasf_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
noinst_HEADERS = gstasfdemux.h asfheaders.h asfpacket.h gstrtpasfdepay.h gstrtspwms.h
all: all-am
@@ -627,46 +620,46 @@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
libgstasf_la-gstasfdemux.lo: gstasfdemux.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstasf_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstasf_la_CFLAGS) $(CFLAGS) -MT libgstasf_la-gstasfdemux.lo -MD -MP -MF $(DEPDIR)/libgstasf_la-gstasfdemux.Tpo -c -o libgstasf_la-gstasfdemux.lo `test -f 'gstasfdemux.c' || echo '$(srcdir)/'`gstasfdemux.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstasf_la_CFLAGS) $(CFLAGS) -MT libgstasf_la-gstasfdemux.lo -MD -MP -MF $(DEPDIR)/libgstasf_la-gstasfdemux.Tpo -c -o libgstasf_la-gstasfdemux.lo `test -f 'gstasfdemux.c' || echo '$(srcdir)/'`gstasfdemux.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstasf_la-gstasfdemux.Tpo $(DEPDIR)/libgstasf_la-gstasfdemux.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gstasfdemux.c' object='libgstasf_la-gstasfdemux.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstasf_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstasf_la_CFLAGS) $(CFLAGS) -c -o libgstasf_la-gstasfdemux.lo `test -f 'gstasfdemux.c' || echo '$(srcdir)/'`gstasfdemux.c
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstasf_la_CFLAGS) $(CFLAGS) -c -o libgstasf_la-gstasfdemux.lo `test -f 'gstasfdemux.c' || echo '$(srcdir)/'`gstasfdemux.c
libgstasf_la-gstasf.lo: gstasf.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstasf_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstasf_la_CFLAGS) $(CFLAGS) -MT libgstasf_la-gstasf.lo -MD -MP -MF $(DEPDIR)/libgstasf_la-gstasf.Tpo -c -o libgstasf_la-gstasf.lo `test -f 'gstasf.c' || echo '$(srcdir)/'`gstasf.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstasf_la_CFLAGS) $(CFLAGS) -MT libgstasf_la-gstasf.lo -MD -MP -MF $(DEPDIR)/libgstasf_la-gstasf.Tpo -c -o libgstasf_la-gstasf.lo `test -f 'gstasf.c' || echo '$(srcdir)/'`gstasf.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstasf_la-gstasf.Tpo $(DEPDIR)/libgstasf_la-gstasf.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gstasf.c' object='libgstasf_la-gstasf.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstasf_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstasf_la_CFLAGS) $(CFLAGS) -c -o libgstasf_la-gstasf.lo `test -f 'gstasf.c' || echo '$(srcdir)/'`gstasf.c
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstasf_la_CFLAGS) $(CFLAGS) -c -o libgstasf_la-gstasf.lo `test -f 'gstasf.c' || echo '$(srcdir)/'`gstasf.c
libgstasf_la-asfheaders.lo: asfheaders.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstasf_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstasf_la_CFLAGS) $(CFLAGS) -MT libgstasf_la-asfheaders.lo -MD -MP -MF $(DEPDIR)/libgstasf_la-asfheaders.Tpo -c -o libgstasf_la-asfheaders.lo `test -f 'asfheaders.c' || echo '$(srcdir)/'`asfheaders.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstasf_la_CFLAGS) $(CFLAGS) -MT libgstasf_la-asfheaders.lo -MD -MP -MF $(DEPDIR)/libgstasf_la-asfheaders.Tpo -c -o libgstasf_la-asfheaders.lo `test -f 'asfheaders.c' || echo '$(srcdir)/'`asfheaders.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstasf_la-asfheaders.Tpo $(DEPDIR)/libgstasf_la-asfheaders.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='asfheaders.c' object='libgstasf_la-asfheaders.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstasf_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstasf_la_CFLAGS) $(CFLAGS) -c -o libgstasf_la-asfheaders.lo `test -f 'asfheaders.c' || echo '$(srcdir)/'`asfheaders.c
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstasf_la_CFLAGS) $(CFLAGS) -c -o libgstasf_la-asfheaders.lo `test -f 'asfheaders.c' || echo '$(srcdir)/'`asfheaders.c
libgstasf_la-asfpacket.lo: asfpacket.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstasf_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstasf_la_CFLAGS) $(CFLAGS) -MT libgstasf_la-asfpacket.lo -MD -MP -MF $(DEPDIR)/libgstasf_la-asfpacket.Tpo -c -o libgstasf_la-asfpacket.lo `test -f 'asfpacket.c' || echo '$(srcdir)/'`asfpacket.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstasf_la_CFLAGS) $(CFLAGS) -MT libgstasf_la-asfpacket.lo -MD -MP -MF $(DEPDIR)/libgstasf_la-asfpacket.Tpo -c -o libgstasf_la-asfpacket.lo `test -f 'asfpacket.c' || echo '$(srcdir)/'`asfpacket.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstasf_la-asfpacket.Tpo $(DEPDIR)/libgstasf_la-asfpacket.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='asfpacket.c' object='libgstasf_la-asfpacket.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstasf_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstasf_la_CFLAGS) $(CFLAGS) -c -o libgstasf_la-asfpacket.lo `test -f 'asfpacket.c' || echo '$(srcdir)/'`asfpacket.c
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstasf_la_CFLAGS) $(CFLAGS) -c -o libgstasf_la-asfpacket.lo `test -f 'asfpacket.c' || echo '$(srcdir)/'`asfpacket.c
libgstasf_la-gstrtpasfdepay.lo: gstrtpasfdepay.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstasf_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstasf_la_CFLAGS) $(CFLAGS) -MT libgstasf_la-gstrtpasfdepay.lo -MD -MP -MF $(DEPDIR)/libgstasf_la-gstrtpasfdepay.Tpo -c -o libgstasf_la-gstrtpasfdepay.lo `test -f 'gstrtpasfdepay.c' || echo '$(srcdir)/'`gstrtpasfdepay.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstasf_la_CFLAGS) $(CFLAGS) -MT libgstasf_la-gstrtpasfdepay.lo -MD -MP -MF $(DEPDIR)/libgstasf_la-gstrtpasfdepay.Tpo -c -o libgstasf_la-gstrtpasfdepay.lo `test -f 'gstrtpasfdepay.c' || echo '$(srcdir)/'`gstrtpasfdepay.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstasf_la-gstrtpasfdepay.Tpo $(DEPDIR)/libgstasf_la-gstrtpasfdepay.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gstrtpasfdepay.c' object='libgstasf_la-gstrtpasfdepay.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstasf_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstasf_la_CFLAGS) $(CFLAGS) -c -o libgstasf_la-gstrtpasfdepay.lo `test -f 'gstrtpasfdepay.c' || echo '$(srcdir)/'`gstrtpasfdepay.c
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstasf_la_CFLAGS) $(CFLAGS) -c -o libgstasf_la-gstrtpasfdepay.lo `test -f 'gstrtpasfdepay.c' || echo '$(srcdir)/'`gstrtpasfdepay.c
libgstasf_la-gstrtspwms.lo: gstrtspwms.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstasf_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstasf_la_CFLAGS) $(CFLAGS) -MT libgstasf_la-gstrtspwms.lo -MD -MP -MF $(DEPDIR)/libgstasf_la-gstrtspwms.Tpo -c -o libgstasf_la-gstrtspwms.lo `test -f 'gstrtspwms.c' || echo '$(srcdir)/'`gstrtspwms.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstasf_la_CFLAGS) $(CFLAGS) -MT libgstasf_la-gstrtspwms.lo -MD -MP -MF $(DEPDIR)/libgstasf_la-gstrtspwms.Tpo -c -o libgstasf_la-gstrtspwms.lo `test -f 'gstrtspwms.c' || echo '$(srcdir)/'`gstrtspwms.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstasf_la-gstrtspwms.Tpo $(DEPDIR)/libgstasf_la-gstrtspwms.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gstrtspwms.c' object='libgstasf_la-gstrtspwms.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstasf_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstasf_la_CFLAGS) $(CFLAGS) -c -o libgstasf_la-gstrtspwms.lo `test -f 'gstrtspwms.c' || echo '$(srcdir)/'`gstrtspwms.c
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstasf_la_CFLAGS) $(CFLAGS) -c -o libgstasf_la-gstrtspwms.lo `test -f 'gstrtspwms.c' || echo '$(srcdir)/'`gstrtspwms.c
mostlyclean-libtool:
-rm -f *.lo
diff --git a/gst/asfdemux/gstasfdemux.c b/gst/asfdemux/gstasfdemux.c
index d81ad16..520df67 100644
--- a/gst/asfdemux/gstasfdemux.c
+++ b/gst/asfdemux/gstasfdemux.c
@@ -1304,6 +1304,7 @@
{
GstClockTime preroll_time;
guint i, num_no_data = 0;
+ AsfStreamType prerolled_types = 0, all_types = 0;
/* Allow at least 500ms of preroll_time */
preroll_time = MAX (demux->preroll, 500 * GST_MSECOND);
@@ -1317,12 +1318,17 @@
gint last_idx;
stream = &demux->stream[i];
+
+ all_types |= stream->type;
+
if (G_UNLIKELY (stream->payloads->len == 0)) {
++num_no_data;
GST_LOG_OBJECT (stream->pad, "no data queued");
continue;
}
+ prerolled_types |= stream->type;
+
/* find last payload with timestamp */
for (last_idx = stream->payloads->len - 1;
last_idx >= 0 && (last_payload == NULL
@@ -1340,6 +1346,13 @@
}
}
+ GST_LOG_OBJECT (demux, "all_types:%d prerolled_types:%d",
+ all_types, prerolled_types);
+
+ /* If streams of each present type have prerolled, we are good to go */
+ if (all_types != 0 && prerolled_types == all_types)
+ return TRUE;
+
if (G_UNLIKELY (num_no_data > 0))
return FALSE;
@@ -1403,7 +1416,7 @@
}
static gboolean
-gst_asf_demux_check_first_ts (GstASFDemux * demux, gboolean force)
+gst_asf_demux_get_first_ts (GstASFDemux * demux)
{
if (G_UNLIKELY (!GST_CLOCK_TIME_IS_VALID (demux->first_ts))) {
GstClockTime first_ts = GST_CLOCK_TIME_NONE;
@@ -1438,22 +1451,20 @@
from it. I havent found a better way to distinguish between these two, except to set an arbitrary boundary
and disregard the first 0 timestamp if the second timestamp is bigger than the boundary) */
- if (stream_min_ts == 0 && stream_min_ts2 == GST_CLOCK_TIME_NONE && !force) /* still waiting for the second timestamp */
- return FALSE;
+ GST_DEBUG_OBJECT (demux,
+ "stream #%u stream_min_ts %" GST_TIME_FORMAT " stream_min_ts2 %"
+ GST_TIME_FORMAT, stream->id, GST_TIME_ARGS (stream_min_ts),
+ GST_TIME_ARGS (stream_min_ts2));
if (stream_min_ts == 0 && stream_min_ts2 > GST_SECOND) /* first timestamp is 0 and second is significantly larger, disregard the 0 */
stream_min_ts = stream_min_ts2;
- /* if we don't have timestamp for this stream, wait for more data */
- if (!GST_CLOCK_TIME_IS_VALID (stream_min_ts) && !force)
- return FALSE;
-
if (GST_CLOCK_TIME_IS_VALID (stream_min_ts) &&
(!GST_CLOCK_TIME_IS_VALID (first_ts) || first_ts > stream_min_ts))
first_ts = stream_min_ts;
}
- if (!GST_CLOCK_TIME_IS_VALID (first_ts)) /* can happen with force = TRUE */
+ if (!GST_CLOCK_TIME_IS_VALID (first_ts)) /* can happen */
first_ts = 0;
demux->first_ts = first_ts;
@@ -1547,14 +1558,14 @@
if (demux->activated_streams)
return TRUE;
- if (G_UNLIKELY (!gst_asf_demux_check_first_ts (demux, force)))
- return FALSE;
-
if (!all_streams_prerolled (demux) && !force) {
GST_DEBUG_OBJECT (demux, "not all streams with data beyond preroll yet");
return FALSE;
}
+ if (G_UNLIKELY (!gst_asf_demux_get_first_ts (demux)))
+ return FALSE;
+
for (i = 0; i < demux->num_streams; ++i) {
AsfStream *stream = &demux->stream[i];
@@ -1659,7 +1670,7 @@
if (G_UNLIKELY (GST_CLOCK_TIME_IS_VALID (payload->ts) &&
(payload->ts < demux->segment.start))) {
- if (G_UNLIKELY ((!demux->keyunit_sync) && (!demux->accurate)
+ if (G_UNLIKELY ((demux->keyunit_sync) && (!demux->accurate)
&& payload->keyframe)) {
GST_DEBUG_OBJECT (stream->pad,
"Found keyframe, updating segment start to %" GST_TIME_FORMAT,
@@ -1743,7 +1754,7 @@
}
/* FIXME : only if ACCURATE ! */
- if (G_LIKELY (!demux->keyunit_sync && !demux->accurate
+ if (G_LIKELY (demux->keyunit_sync && !demux->accurate
&& (GST_CLOCK_TIME_IS_VALID (payload->ts)))
&& !GST_ASF_DEMUX_IS_REVERSE_PLAYBACK (demux->segment)) {
GST_DEBUG ("Adjusting newsegment start to %" GST_TIME_FORMAT,
@@ -3144,8 +3155,10 @@
break;
}
- if (stream)
+ if (stream) {
stream->inspect_payload = inspect_payload;
+ stream->type = stream_type;
+ }
return stream;
not_enough_data:
diff --git a/gst/dvdlpcmdec/Makefile.am b/gst/dvdlpcmdec/Makefile.am
index 6fb9371..ee91b17 100644
--- a/gst/dvdlpcmdec/Makefile.am
+++ b/gst/dvdlpcmdec/Makefile.am
@@ -5,6 +5,5 @@
libgstdvdlpcmdec_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS)
libgstdvdlpcmdec_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-@GST_API_VERSION@ $(GST_BASE_LIBS) $(GST_LIBS)
libgstdvdlpcmdec_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstdvdlpcmdec_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
noinst_HEADERS = gstdvdlpcmdec.h
diff --git a/gst/dvdlpcmdec/Makefile.in b/gst/dvdlpcmdec/Makefile.in
index 15263c0..81a5e3b 100644
--- a/gst/dvdlpcmdec/Makefile.in
+++ b/gst/dvdlpcmdec/Makefile.in
@@ -170,8 +170,8 @@
am__v_lt_0 = --silent
am__v_lt_1 =
libgstdvdlpcmdec_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
- $(libgstdvdlpcmdec_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=link $(CCLD) $(libgstdvdlpcmdec_la_CFLAGS) $(CFLAGS) \
+ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+ $(libgstdvdlpcmdec_la_CFLAGS) $(CFLAGS) \
$(libgstdvdlpcmdec_la_LDFLAGS) $(LDFLAGS) -o $@
AM_V_P = $(am__v_P_@AM_V@)
am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
@@ -284,6 +284,7 @@
ERROR_CFLAGS = @ERROR_CFLAGS@
ERROR_CXXFLAGS = @ERROR_CXXFLAGS@
EXEEXT = @EXEEXT@
+EXTRA_CFLAGS = @EXTRA_CFLAGS@
FFLAGS = @FFLAGS@
FGREP = @FGREP@
GCOV = @GCOV@
@@ -335,7 +336,6 @@
GST_PLUGINS_NONPORTED = @GST_PLUGINS_NONPORTED@
GST_PLUGINS_SELECTED = @GST_PLUGINS_SELECTED@
GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
-GST_PLUGIN_LIBTOOLFLAGS = @GST_PLUGIN_LIBTOOLFLAGS@
GST_PREFIX = @GST_PREFIX@
GST_REVISION = @GST_REVISION@
GST_TOOLS_DIR = @GST_TOOLS_DIR@
@@ -346,7 +346,6 @@
GTKDOC_REBASE = @GTKDOC_REBASE@
HAVE_CXX = @HAVE_CXX@
HAVE_DVDREAD = @HAVE_DVDREAD@
-HAVE_LAME = @HAVE_LAME@
HTML_DIR = @HTML_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
@@ -355,8 +354,6 @@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INTLLIBS = @INTLLIBS@
INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-LAME_CFLAGS = @LAME_CFLAGS@
-LAME_LIBS = @LAME_LIBS@
LD = @LD@
LDFLAGS = @LDFLAGS@
LIBICONV = @LIBICONV@
@@ -378,8 +375,6 @@
MKDIR_P = @MKDIR_P@
MPEG2DEC_CFLAGS = @MPEG2DEC_CFLAGS@
MPEG2DEC_LIBS = @MPEG2DEC_LIBS@
-MPG123_CFLAGS = @MPG123_CFLAGS@
-MPG123_LIBS = @MPG123_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_015 = @MSGFMT_015@
MSGMERGE = @MSGMERGE@
@@ -422,13 +417,13 @@
SIDPLAY_CFLAGS = @SIDPLAY_CFLAGS@
SIDPLAY_LIBS = @SIDPLAY_LIBS@
STRIP = @STRIP@
-TWOLAME_CFLAGS = @TWOLAME_CFLAGS@
-TWOLAME_LIBS = @TWOLAME_LIBS@
USE_NLS = @USE_NLS@
VALGRIND_CFLAGS = @VALGRIND_CFLAGS@
VALGRIND_LIBS = @VALGRIND_LIBS@
VALGRIND_PATH = @VALGRIND_PATH@
VERSION = @VERSION@
+VISIBILITY_CFLAGS = @VISIBILITY_CFLAGS@
+VISIBILITY_CXXFLAGS = @VISIBILITY_CXXFLAGS@
WARNING_CFLAGS = @WARNING_CFLAGS@
WARNING_CXXFLAGS = @WARNING_CXXFLAGS@
WIN32_LIBS = @WIN32_LIBS@
@@ -505,7 +500,6 @@
libgstdvdlpcmdec_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS)
libgstdvdlpcmdec_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-@GST_API_VERSION@ $(GST_BASE_LIBS) $(GST_LIBS)
libgstdvdlpcmdec_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstdvdlpcmdec_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
noinst_HEADERS = gstdvdlpcmdec.h
all: all-am
@@ -612,11 +606,11 @@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
libgstdvdlpcmdec_la-gstdvdlpcmdec.lo: gstdvdlpcmdec.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstdvdlpcmdec_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstdvdlpcmdec_la_CFLAGS) $(CFLAGS) -MT libgstdvdlpcmdec_la-gstdvdlpcmdec.lo -MD -MP -MF $(DEPDIR)/libgstdvdlpcmdec_la-gstdvdlpcmdec.Tpo -c -o libgstdvdlpcmdec_la-gstdvdlpcmdec.lo `test -f 'gstdvdlpcmdec.c' || echo '$(srcdir)/'`gstdvdlpcmdec.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstdvdlpcmdec_la_CFLAGS) $(CFLAGS) -MT libgstdvdlpcmdec_la-gstdvdlpcmdec.lo -MD -MP -MF $(DEPDIR)/libgstdvdlpcmdec_la-gstdvdlpcmdec.Tpo -c -o libgstdvdlpcmdec_la-gstdvdlpcmdec.lo `test -f 'gstdvdlpcmdec.c' || echo '$(srcdir)/'`gstdvdlpcmdec.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstdvdlpcmdec_la-gstdvdlpcmdec.Tpo $(DEPDIR)/libgstdvdlpcmdec_la-gstdvdlpcmdec.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gstdvdlpcmdec.c' object='libgstdvdlpcmdec_la-gstdvdlpcmdec.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstdvdlpcmdec_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstdvdlpcmdec_la_CFLAGS) $(CFLAGS) -c -o libgstdvdlpcmdec_la-gstdvdlpcmdec.lo `test -f 'gstdvdlpcmdec.c' || echo '$(srcdir)/'`gstdvdlpcmdec.c
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstdvdlpcmdec_la_CFLAGS) $(CFLAGS) -c -o libgstdvdlpcmdec_la-gstdvdlpcmdec.lo `test -f 'gstdvdlpcmdec.c' || echo '$(srcdir)/'`gstdvdlpcmdec.c
mostlyclean-libtool:
-rm -f *.lo
diff --git a/gst/dvdlpcmdec/gstdvdlpcmdec.c b/gst/dvdlpcmdec/gstdvdlpcmdec.c
index a402007..081084f 100644
--- a/gst/dvdlpcmdec/gstdvdlpcmdec.c
+++ b/gst/dvdlpcmdec/gstdvdlpcmdec.c
@@ -37,6 +37,7 @@
GST_PAD_ALWAYS,
GST_STATIC_CAPS ("audio/x-private1-lpcm; "
"audio/x-private2-lpcm; "
+ "audio/x-private-ts-lpcm; "
"audio/x-lpcm, "
"width = (int) { 16, 20, 24 }, "
"rate = (int) { 32000, 44100, 48000, 96000 }, "
@@ -152,6 +153,74 @@
{GST_AUDIO_CHANNEL_POSITION_INVALID}
};
+static const GstAudioChannelPosition bluray_channel_positions[][8] = {
+ /* invalid */
+ {GST_AUDIO_CHANNEL_POSITION_INVALID},
+ /* mono */
+ {GST_AUDIO_CHANNEL_POSITION_MONO},
+ /* invalid */
+ {GST_AUDIO_CHANNEL_POSITION_INVALID},
+ /* stereo */
+ {GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT,
+ GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT},
+ /* surround */
+ {GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT,
+ GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT,
+ GST_AUDIO_CHANNEL_POSITION_FRONT_CENTER},
+ /* 2.1 */
+ {GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT,
+ GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT,
+ GST_AUDIO_CHANNEL_POSITION_REAR_CENTER},
+ /* 4.0 */
+ {GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT,
+ GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT,
+ GST_AUDIO_CHANNEL_POSITION_FRONT_CENTER,
+ GST_AUDIO_CHANNEL_POSITION_REAR_CENTER},
+ /* 2.2 */
+ {GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT,
+ GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT,
+ GST_AUDIO_CHANNEL_POSITION_SIDE_LEFT,
+ GST_AUDIO_CHANNEL_POSITION_SIDE_RIGHT},
+ /* 5.0 */
+ {GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT,
+ GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT,
+ GST_AUDIO_CHANNEL_POSITION_FRONT_CENTER,
+ GST_AUDIO_CHANNEL_POSITION_SIDE_LEFT,
+ GST_AUDIO_CHANNEL_POSITION_SIDE_RIGHT},
+ /* 5.1 */
+ {GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT,
+ GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT,
+ GST_AUDIO_CHANNEL_POSITION_FRONT_CENTER,
+ GST_AUDIO_CHANNEL_POSITION_SIDE_LEFT,
+ GST_AUDIO_CHANNEL_POSITION_SIDE_RIGHT,
+ GST_AUDIO_CHANNEL_POSITION_LFE1},
+ /* 7.0 */
+ {GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT,
+ GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT,
+ GST_AUDIO_CHANNEL_POSITION_FRONT_CENTER,
+ GST_AUDIO_CHANNEL_POSITION_SIDE_LEFT,
+ GST_AUDIO_CHANNEL_POSITION_SIDE_RIGHT,
+ GST_AUDIO_CHANNEL_POSITION_REAR_LEFT,
+ GST_AUDIO_CHANNEL_POSITION_REAR_RIGHT},
+ /* 7.1 */
+ {GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT,
+ GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT,
+ GST_AUDIO_CHANNEL_POSITION_FRONT_CENTER,
+ GST_AUDIO_CHANNEL_POSITION_SIDE_LEFT,
+ GST_AUDIO_CHANNEL_POSITION_SIDE_RIGHT,
+ GST_AUDIO_CHANNEL_POSITION_REAR_LEFT,
+ GST_AUDIO_CHANNEL_POSITION_REAR_RIGHT,
+ GST_AUDIO_CHANNEL_POSITION_LFE1},
+ /* invalid */
+ {GST_AUDIO_CHANNEL_POSITION_INVALID},
+ /* invalid */
+ {GST_AUDIO_CHANNEL_POSITION_INVALID},
+ /* invalid */
+ {GST_AUDIO_CHANNEL_POSITION_INVALID},
+ /* invalid */
+ {GST_AUDIO_CHANNEL_POSITION_INVALID}
+};
+
static void
gst_dvdlpcmdec_send_tags (GstDvdLpcmDec * dvdlpcmdec)
{
@@ -192,20 +261,21 @@
static void
gst_dvdlpcmdec_update_audio_formats (GstDvdLpcmDec * dec, gint channels,
- gint rate, GstAudioFormat format)
+ gint rate, GstAudioFormat format, guint8 channel_indicator,
+ const GstAudioChannelPosition positions[][8])
{
- GST_DEBUG_OBJECT (dec, "got channles = %d, rate = %d, format = %d", channels,
+ GST_DEBUG_OBJECT (dec, "got channels = %d, rate = %d, format = %d", channels,
rate, format);
/* Reorder the channel positions and set the default into for the audio */
if (channels < 9
- && channel_positions[channels - 1][0] !=
+ && positions[channel_indicator][0] !=
GST_AUDIO_CHANNEL_POSITION_INVALID) {
const GstAudioChannelPosition *position;
GstAudioChannelPosition sorted_position[8];
guint c;
- position = channel_positions[channels - 1];
+ position = positions[channel_indicator];
for (c = 0; c < channels; ++c)
sorted_position[c] = position[c];
gst_audio_channel_positions_to_valid_order (sorted_position, channels);
@@ -244,6 +314,10 @@
dvdlpcmdec->mode = GST_LPCM_1394;
goto done;
}
+ if (gst_structure_has_name (structure, "audio/x-private-ts-lpcm")) {
+ dvdlpcmdec->mode = GST_LPCM_BLURAY;
+ goto done;
+ }
dvdlpcmdec->mode = GST_LPCM_RAW;
@@ -272,7 +346,8 @@
break;
}
- gst_dvdlpcmdec_update_audio_formats (dvdlpcmdec, channels, rate, format);
+ gst_dvdlpcmdec_update_audio_formats (dvdlpcmdec, channels, rate, format,
+ channels - 1, channel_positions);
dvdlpcmdec->width = width;
@@ -344,7 +419,8 @@
/* And, of course, the number of channels (up to 8) */
channels = ((header >> 8) & 0x7) + 1;
- gst_dvdlpcmdec_update_audio_formats (dec, channels, rate, format);
+ gst_dvdlpcmdec_update_audio_formats (dec, channels, rate, format,
+ channels - 1, channel_positions);
}
static GstFlowReturn
@@ -506,6 +582,131 @@
}
static GstFlowReturn
+gst_dvdlpcmdec_parse_bluray (GstDvdLpcmDec * dvdlpcmdec, GstAdapter * adapter,
+ gint * offset, gint * len)
+{
+ guint32 header;
+ const guint8 *data;
+ guint8 channel_indicator;
+
+ data = (const guint8 *) gst_adapter_map (adapter, 4);
+ if (!data)
+ goto too_small;
+
+ header = GST_READ_UINT32_BE (data);
+
+ gst_adapter_unmap (adapter);
+
+ /* see if we have a new header */
+ if (header != dvdlpcmdec->header) {
+ GstAudioFormat format;
+ gint rate, channels;
+
+ switch ((header >> 6) & 0x3) {
+ case 0x1:
+ format = GST_AUDIO_FORMAT_S16BE;
+ dvdlpcmdec->width = 16;
+ break;
+ case 0x2:
+ format = GST_AUDIO_FORMAT_S24BE;
+ dvdlpcmdec->width = 20;
+ break;
+ case 0x3:
+ format = GST_AUDIO_FORMAT_S24BE;
+ dvdlpcmdec->width = 24;
+ break;
+ default:
+ format = GST_AUDIO_FORMAT_UNKNOWN;
+ dvdlpcmdec->width = 0;
+ GST_WARNING ("Invalid sample depth!");
+ break;
+ }
+
+ switch ((header >> 8) & 0xf) {
+ case 0x1:
+ rate = 48000;
+ break;
+ case 0x4:
+ rate = 96000;
+ break;
+ case 0x5:
+ rate = 192000;
+ break;
+ default:
+ rate = 0;
+ GST_WARNING ("Invalid audio sampling frequency!");
+ break;
+ }
+ channel_indicator = (header >> 12) & 0xf;
+ switch (channel_indicator) {
+ case 0x1:
+ channels = 1;
+ break;
+ case 0x3:
+ channels = 2;
+ break;
+ case 0x4:
+ case 0x5:
+ channels = 3;
+ break;
+ case 0x6:
+ case 0x7:
+ channels = 4;
+ break;
+ case 0x8:
+ channels = 5;
+ break;
+ case 0x9:
+ channels = 6;
+ break;
+ case 0xa:
+ channels = 7;
+ break;
+ case 0xb:
+ channels = 8;
+ break;
+ default:
+ channels = 0;
+ GST_WARNING ("Invalid number of audio channels!");
+ goto negotiation_failed;
+ }
+ GST_DEBUG_OBJECT (dvdlpcmdec, "got channels %d rate %d format %s",
+ channels, rate, gst_audio_format_to_string (format));
+
+ gst_dvdlpcmdec_update_audio_formats (dvdlpcmdec, channels, rate, format,
+ channel_indicator, bluray_channel_positions);
+
+ if (!gst_dvdlpcmdec_set_output_format (dvdlpcmdec))
+ goto negotiation_failed;
+
+ dvdlpcmdec->header = header;
+ }
+
+ *offset = 4;
+ *len = gst_adapter_available (adapter) - 4;
+
+ return GST_FLOW_OK;
+
+ /* ERRORS */
+too_small:
+ {
+ /* Buffer is too small */
+ GST_ELEMENT_WARNING (dvdlpcmdec, STREAM, DECODE,
+ ("Invalid data found parsing LPCM packet"),
+ ("LPCM packet was too small. Dropping"));
+ *offset = gst_adapter_available (adapter);
+ return GST_FLOW_EOS;
+ }
+negotiation_failed:
+ {
+ GST_ELEMENT_ERROR (dvdlpcmdec, STREAM, FORMAT, (NULL),
+ ("Failed to configure output format"));
+ return GST_FLOW_NOT_NEGOTIATED;
+ }
+
+}
+
+static GstFlowReturn
gst_dvdlpcmdec_parse_1394 (GstDvdLpcmDec * dvdlpcmdec, GstAdapter * adapter,
gint * offset, gint * len)
{
@@ -560,10 +761,11 @@
default:
channels = 0;
GST_WARNING ("Invalid number of audio channels!");
- break;
+ goto negotiation_failed;
}
- gst_dvdlpcmdec_update_audio_formats (dvdlpcmdec, channels, rate, format);
+ gst_dvdlpcmdec_update_audio_formats (dvdlpcmdec, channels, rate, format,
+ channels - 1, channel_positions);
if (!gst_dvdlpcmdec_set_output_format (dvdlpcmdec))
goto negotiation_failed;
@@ -621,6 +823,9 @@
case GST_LPCM_1394:
return gst_dvdlpcmdec_parse_1394 (dvdlpcmdec, adapter, offset, len);
+
+ case GST_LPCM_BLURAY:
+ return gst_dvdlpcmdec_parse_bluray (dvdlpcmdec, adapter, offset, len);
}
return GST_FLOW_ERROR;
}
diff --git a/gst/dvdlpcmdec/gstdvdlpcmdec.h b/gst/dvdlpcmdec/gstdvdlpcmdec.h
index 7f3d0c9..3bdce3f 100644
--- a/gst/dvdlpcmdec/gstdvdlpcmdec.h
+++ b/gst/dvdlpcmdec/gstdvdlpcmdec.h
@@ -45,7 +45,8 @@
GST_LPCM_UNKNOWN,
GST_LPCM_RAW,
GST_LPCM_DVD,
- GST_LPCM_1394
+ GST_LPCM_1394,
+ GST_LPCM_BLURAY
} GstDvdLpcmMode;
struct _GstDvdLpcmDec {
diff --git a/gst/dvdsub/Makefile.am b/gst/dvdsub/Makefile.am
index 5f03587..31f71d2 100644
--- a/gst/dvdsub/Makefile.am
+++ b/gst/dvdsub/Makefile.am
@@ -6,6 +6,5 @@
libgstdvdsub_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_API_VERSION) \
$(GST_BASE_LIBS) $(GST_LIBS)
libgstdvdsub_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstdvdsub_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
noinst_HEADERS = gstdvdsubdec.h gstdvdsubparse.h
diff --git a/gst/dvdsub/Makefile.in b/gst/dvdsub/Makefile.in
index 9ab5193..edeff6f 100644
--- a/gst/dvdsub/Makefile.in
+++ b/gst/dvdsub/Makefile.in
@@ -171,9 +171,9 @@
am__v_lt_0 = --silent
am__v_lt_1 =
libgstdvdsub_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
- $(libgstdvdsub_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
- $(CCLD) $(libgstdvdsub_la_CFLAGS) $(CFLAGS) \
- $(libgstdvdsub_la_LDFLAGS) $(LDFLAGS) -o $@
+ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+ $(libgstdvdsub_la_CFLAGS) $(CFLAGS) $(libgstdvdsub_la_LDFLAGS) \
+ $(LDFLAGS) -o $@
AM_V_P = $(am__v_P_@AM_V@)
am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
am__v_P_0 = false
@@ -285,6 +285,7 @@
ERROR_CFLAGS = @ERROR_CFLAGS@
ERROR_CXXFLAGS = @ERROR_CXXFLAGS@
EXEEXT = @EXEEXT@
+EXTRA_CFLAGS = @EXTRA_CFLAGS@
FFLAGS = @FFLAGS@
FGREP = @FGREP@
GCOV = @GCOV@
@@ -336,7 +337,6 @@
GST_PLUGINS_NONPORTED = @GST_PLUGINS_NONPORTED@
GST_PLUGINS_SELECTED = @GST_PLUGINS_SELECTED@
GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
-GST_PLUGIN_LIBTOOLFLAGS = @GST_PLUGIN_LIBTOOLFLAGS@
GST_PREFIX = @GST_PREFIX@
GST_REVISION = @GST_REVISION@
GST_TOOLS_DIR = @GST_TOOLS_DIR@
@@ -347,7 +347,6 @@
GTKDOC_REBASE = @GTKDOC_REBASE@
HAVE_CXX = @HAVE_CXX@
HAVE_DVDREAD = @HAVE_DVDREAD@
-HAVE_LAME = @HAVE_LAME@
HTML_DIR = @HTML_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
@@ -356,8 +355,6 @@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INTLLIBS = @INTLLIBS@
INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-LAME_CFLAGS = @LAME_CFLAGS@
-LAME_LIBS = @LAME_LIBS@
LD = @LD@
LDFLAGS = @LDFLAGS@
LIBICONV = @LIBICONV@
@@ -379,8 +376,6 @@
MKDIR_P = @MKDIR_P@
MPEG2DEC_CFLAGS = @MPEG2DEC_CFLAGS@
MPEG2DEC_LIBS = @MPEG2DEC_LIBS@
-MPG123_CFLAGS = @MPG123_CFLAGS@
-MPG123_LIBS = @MPG123_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_015 = @MSGFMT_015@
MSGMERGE = @MSGMERGE@
@@ -423,13 +418,13 @@
SIDPLAY_CFLAGS = @SIDPLAY_CFLAGS@
SIDPLAY_LIBS = @SIDPLAY_LIBS@
STRIP = @STRIP@
-TWOLAME_CFLAGS = @TWOLAME_CFLAGS@
-TWOLAME_LIBS = @TWOLAME_LIBS@
USE_NLS = @USE_NLS@
VALGRIND_CFLAGS = @VALGRIND_CFLAGS@
VALGRIND_LIBS = @VALGRIND_LIBS@
VALGRIND_PATH = @VALGRIND_PATH@
VERSION = @VERSION@
+VISIBILITY_CFLAGS = @VISIBILITY_CFLAGS@
+VISIBILITY_CXXFLAGS = @VISIBILITY_CXXFLAGS@
WARNING_CFLAGS = @WARNING_CFLAGS@
WARNING_CXXFLAGS = @WARNING_CXXFLAGS@
WIN32_LIBS = @WIN32_LIBS@
@@ -510,7 +505,6 @@
$(GST_BASE_LIBS) $(GST_LIBS)
libgstdvdsub_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstdvdsub_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
noinst_HEADERS = gstdvdsubdec.h gstdvdsubparse.h
all: all-am
@@ -618,18 +612,18 @@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
libgstdvdsub_la-gstdvdsubdec.lo: gstdvdsubdec.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstdvdsub_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstdvdsub_la_CFLAGS) $(CFLAGS) -MT libgstdvdsub_la-gstdvdsubdec.lo -MD -MP -MF $(DEPDIR)/libgstdvdsub_la-gstdvdsubdec.Tpo -c -o libgstdvdsub_la-gstdvdsubdec.lo `test -f 'gstdvdsubdec.c' || echo '$(srcdir)/'`gstdvdsubdec.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstdvdsub_la_CFLAGS) $(CFLAGS) -MT libgstdvdsub_la-gstdvdsubdec.lo -MD -MP -MF $(DEPDIR)/libgstdvdsub_la-gstdvdsubdec.Tpo -c -o libgstdvdsub_la-gstdvdsubdec.lo `test -f 'gstdvdsubdec.c' || echo '$(srcdir)/'`gstdvdsubdec.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstdvdsub_la-gstdvdsubdec.Tpo $(DEPDIR)/libgstdvdsub_la-gstdvdsubdec.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gstdvdsubdec.c' object='libgstdvdsub_la-gstdvdsubdec.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstdvdsub_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstdvdsub_la_CFLAGS) $(CFLAGS) -c -o libgstdvdsub_la-gstdvdsubdec.lo `test -f 'gstdvdsubdec.c' || echo '$(srcdir)/'`gstdvdsubdec.c
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstdvdsub_la_CFLAGS) $(CFLAGS) -c -o libgstdvdsub_la-gstdvdsubdec.lo `test -f 'gstdvdsubdec.c' || echo '$(srcdir)/'`gstdvdsubdec.c
libgstdvdsub_la-gstdvdsubparse.lo: gstdvdsubparse.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstdvdsub_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstdvdsub_la_CFLAGS) $(CFLAGS) -MT libgstdvdsub_la-gstdvdsubparse.lo -MD -MP -MF $(DEPDIR)/libgstdvdsub_la-gstdvdsubparse.Tpo -c -o libgstdvdsub_la-gstdvdsubparse.lo `test -f 'gstdvdsubparse.c' || echo '$(srcdir)/'`gstdvdsubparse.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstdvdsub_la_CFLAGS) $(CFLAGS) -MT libgstdvdsub_la-gstdvdsubparse.lo -MD -MP -MF $(DEPDIR)/libgstdvdsub_la-gstdvdsubparse.Tpo -c -o libgstdvdsub_la-gstdvdsubparse.lo `test -f 'gstdvdsubparse.c' || echo '$(srcdir)/'`gstdvdsubparse.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstdvdsub_la-gstdvdsubparse.Tpo $(DEPDIR)/libgstdvdsub_la-gstdvdsubparse.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gstdvdsubparse.c' object='libgstdvdsub_la-gstdvdsubparse.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstdvdsub_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstdvdsub_la_CFLAGS) $(CFLAGS) -c -o libgstdvdsub_la-gstdvdsubparse.lo `test -f 'gstdvdsubparse.c' || echo '$(srcdir)/'`gstdvdsubparse.c
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstdvdsub_la_CFLAGS) $(CFLAGS) -c -o libgstdvdsub_la-gstdvdsubparse.lo `test -f 'gstdvdsubparse.c' || echo '$(srcdir)/'`gstdvdsubparse.c
mostlyclean-libtool:
-rm -f *.lo
diff --git a/gst/realmedia/Makefile.am b/gst/realmedia/Makefile.am
index 654a3d6..f77522d 100644
--- a/gst/realmedia/Makefile.am
+++ b/gst/realmedia/Makefile.am
@@ -14,7 +14,6 @@
-lgstpbutils-@GST_API_VERSION@ \
$(GST_BASE_LIBS) $(GST_LIBS)
libgstrealmedia_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstrealmedia_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
noinst_HEADERS = rademux.h rmdemux.h rmutils.h rdtdepay.h rdtmanager.h \
rdtjitterbuffer.h rtspreal.h realhash.h asmrules.h gstrdtbuffer.h \
diff --git a/gst/realmedia/Makefile.in b/gst/realmedia/Makefile.in
index 58a96fc..09bb298 100644
--- a/gst/realmedia/Makefile.in
+++ b/gst/realmedia/Makefile.in
@@ -180,8 +180,8 @@
am__v_lt_0 = --silent
am__v_lt_1 =
libgstrealmedia_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
- $(libgstrealmedia_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
- $(CCLD) $(libgstrealmedia_la_CFLAGS) $(CFLAGS) \
+ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+ $(libgstrealmedia_la_CFLAGS) $(CFLAGS) \
$(libgstrealmedia_la_LDFLAGS) $(LDFLAGS) -o $@
PROGRAMS = $(noinst_PROGRAMS)
asmrules_SOURCES = asmrules.c
@@ -301,6 +301,7 @@
ERROR_CFLAGS = @ERROR_CFLAGS@
ERROR_CXXFLAGS = @ERROR_CXXFLAGS@
EXEEXT = @EXEEXT@
+EXTRA_CFLAGS = @EXTRA_CFLAGS@
FFLAGS = @FFLAGS@
FGREP = @FGREP@
GCOV = @GCOV@
@@ -352,7 +353,6 @@
GST_PLUGINS_NONPORTED = @GST_PLUGINS_NONPORTED@
GST_PLUGINS_SELECTED = @GST_PLUGINS_SELECTED@
GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
-GST_PLUGIN_LIBTOOLFLAGS = @GST_PLUGIN_LIBTOOLFLAGS@
GST_PREFIX = @GST_PREFIX@
GST_REVISION = @GST_REVISION@
GST_TOOLS_DIR = @GST_TOOLS_DIR@
@@ -363,7 +363,6 @@
GTKDOC_REBASE = @GTKDOC_REBASE@
HAVE_CXX = @HAVE_CXX@
HAVE_DVDREAD = @HAVE_DVDREAD@
-HAVE_LAME = @HAVE_LAME@
HTML_DIR = @HTML_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
@@ -372,8 +371,6 @@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INTLLIBS = @INTLLIBS@
INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-LAME_CFLAGS = @LAME_CFLAGS@
-LAME_LIBS = @LAME_LIBS@
LD = @LD@
LDFLAGS = @LDFLAGS@
LIBICONV = @LIBICONV@
@@ -395,8 +392,6 @@
MKDIR_P = @MKDIR_P@
MPEG2DEC_CFLAGS = @MPEG2DEC_CFLAGS@
MPEG2DEC_LIBS = @MPEG2DEC_LIBS@
-MPG123_CFLAGS = @MPG123_CFLAGS@
-MPG123_LIBS = @MPG123_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_015 = @MSGFMT_015@
MSGMERGE = @MSGMERGE@
@@ -439,13 +434,13 @@
SIDPLAY_CFLAGS = @SIDPLAY_CFLAGS@
SIDPLAY_LIBS = @SIDPLAY_LIBS@
STRIP = @STRIP@
-TWOLAME_CFLAGS = @TWOLAME_CFLAGS@
-TWOLAME_LIBS = @TWOLAME_LIBS@
USE_NLS = @USE_NLS@
VALGRIND_CFLAGS = @VALGRIND_CFLAGS@
VALGRIND_LIBS = @VALGRIND_LIBS@
VALGRIND_PATH = @VALGRIND_PATH@
VERSION = @VERSION@
+VISIBILITY_CFLAGS = @VISIBILITY_CFLAGS@
+VISIBILITY_CXXFLAGS = @VISIBILITY_CXXFLAGS@
WARNING_CFLAGS = @WARNING_CFLAGS@
WARNING_CXXFLAGS = @WARNING_CXXFLAGS@
WIN32_LIBS = @WIN32_LIBS@
@@ -532,7 +527,6 @@
$(GST_BASE_LIBS) $(GST_LIBS)
libgstrealmedia_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstrealmedia_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
noinst_HEADERS = rademux.h rmdemux.h rmutils.h rdtdepay.h rdtmanager.h \
rdtjitterbuffer.h rtspreal.h realhash.h asmrules.h gstrdtbuffer.h \
pnmsrc.h
@@ -669,88 +663,88 @@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
libgstrealmedia_la-rademux.lo: rademux.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstrealmedia_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstrealmedia_la_CFLAGS) $(CFLAGS) -MT libgstrealmedia_la-rademux.lo -MD -MP -MF $(DEPDIR)/libgstrealmedia_la-rademux.Tpo -c -o libgstrealmedia_la-rademux.lo `test -f 'rademux.c' || echo '$(srcdir)/'`rademux.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstrealmedia_la_CFLAGS) $(CFLAGS) -MT libgstrealmedia_la-rademux.lo -MD -MP -MF $(DEPDIR)/libgstrealmedia_la-rademux.Tpo -c -o libgstrealmedia_la-rademux.lo `test -f 'rademux.c' || echo '$(srcdir)/'`rademux.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstrealmedia_la-rademux.Tpo $(DEPDIR)/libgstrealmedia_la-rademux.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='rademux.c' object='libgstrealmedia_la-rademux.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstrealmedia_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstrealmedia_la_CFLAGS) $(CFLAGS) -c -o libgstrealmedia_la-rademux.lo `test -f 'rademux.c' || echo '$(srcdir)/'`rademux.c
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstrealmedia_la_CFLAGS) $(CFLAGS) -c -o libgstrealmedia_la-rademux.lo `test -f 'rademux.c' || echo '$(srcdir)/'`rademux.c
libgstrealmedia_la-rmdemux.lo: rmdemux.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstrealmedia_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstrealmedia_la_CFLAGS) $(CFLAGS) -MT libgstrealmedia_la-rmdemux.lo -MD -MP -MF $(DEPDIR)/libgstrealmedia_la-rmdemux.Tpo -c -o libgstrealmedia_la-rmdemux.lo `test -f 'rmdemux.c' || echo '$(srcdir)/'`rmdemux.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstrealmedia_la_CFLAGS) $(CFLAGS) -MT libgstrealmedia_la-rmdemux.lo -MD -MP -MF $(DEPDIR)/libgstrealmedia_la-rmdemux.Tpo -c -o libgstrealmedia_la-rmdemux.lo `test -f 'rmdemux.c' || echo '$(srcdir)/'`rmdemux.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstrealmedia_la-rmdemux.Tpo $(DEPDIR)/libgstrealmedia_la-rmdemux.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='rmdemux.c' object='libgstrealmedia_la-rmdemux.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstrealmedia_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstrealmedia_la_CFLAGS) $(CFLAGS) -c -o libgstrealmedia_la-rmdemux.lo `test -f 'rmdemux.c' || echo '$(srcdir)/'`rmdemux.c
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstrealmedia_la_CFLAGS) $(CFLAGS) -c -o libgstrealmedia_la-rmdemux.lo `test -f 'rmdemux.c' || echo '$(srcdir)/'`rmdemux.c
libgstrealmedia_la-rmutils.lo: rmutils.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstrealmedia_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstrealmedia_la_CFLAGS) $(CFLAGS) -MT libgstrealmedia_la-rmutils.lo -MD -MP -MF $(DEPDIR)/libgstrealmedia_la-rmutils.Tpo -c -o libgstrealmedia_la-rmutils.lo `test -f 'rmutils.c' || echo '$(srcdir)/'`rmutils.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstrealmedia_la_CFLAGS) $(CFLAGS) -MT libgstrealmedia_la-rmutils.lo -MD -MP -MF $(DEPDIR)/libgstrealmedia_la-rmutils.Tpo -c -o libgstrealmedia_la-rmutils.lo `test -f 'rmutils.c' || echo '$(srcdir)/'`rmutils.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstrealmedia_la-rmutils.Tpo $(DEPDIR)/libgstrealmedia_la-rmutils.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='rmutils.c' object='libgstrealmedia_la-rmutils.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstrealmedia_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstrealmedia_la_CFLAGS) $(CFLAGS) -c -o libgstrealmedia_la-rmutils.lo `test -f 'rmutils.c' || echo '$(srcdir)/'`rmutils.c
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstrealmedia_la_CFLAGS) $(CFLAGS) -c -o libgstrealmedia_la-rmutils.lo `test -f 'rmutils.c' || echo '$(srcdir)/'`rmutils.c
libgstrealmedia_la-rdtdepay.lo: rdtdepay.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstrealmedia_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstrealmedia_la_CFLAGS) $(CFLAGS) -MT libgstrealmedia_la-rdtdepay.lo -MD -MP -MF $(DEPDIR)/libgstrealmedia_la-rdtdepay.Tpo -c -o libgstrealmedia_la-rdtdepay.lo `test -f 'rdtdepay.c' || echo '$(srcdir)/'`rdtdepay.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstrealmedia_la_CFLAGS) $(CFLAGS) -MT libgstrealmedia_la-rdtdepay.lo -MD -MP -MF $(DEPDIR)/libgstrealmedia_la-rdtdepay.Tpo -c -o libgstrealmedia_la-rdtdepay.lo `test -f 'rdtdepay.c' || echo '$(srcdir)/'`rdtdepay.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstrealmedia_la-rdtdepay.Tpo $(DEPDIR)/libgstrealmedia_la-rdtdepay.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='rdtdepay.c' object='libgstrealmedia_la-rdtdepay.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstrealmedia_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstrealmedia_la_CFLAGS) $(CFLAGS) -c -o libgstrealmedia_la-rdtdepay.lo `test -f 'rdtdepay.c' || echo '$(srcdir)/'`rdtdepay.c
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstrealmedia_la_CFLAGS) $(CFLAGS) -c -o libgstrealmedia_la-rdtdepay.lo `test -f 'rdtdepay.c' || echo '$(srcdir)/'`rdtdepay.c
libgstrealmedia_la-rdtmanager.lo: rdtmanager.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstrealmedia_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstrealmedia_la_CFLAGS) $(CFLAGS) -MT libgstrealmedia_la-rdtmanager.lo -MD -MP -MF $(DEPDIR)/libgstrealmedia_la-rdtmanager.Tpo -c -o libgstrealmedia_la-rdtmanager.lo `test -f 'rdtmanager.c' || echo '$(srcdir)/'`rdtmanager.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstrealmedia_la_CFLAGS) $(CFLAGS) -MT libgstrealmedia_la-rdtmanager.lo -MD -MP -MF $(DEPDIR)/libgstrealmedia_la-rdtmanager.Tpo -c -o libgstrealmedia_la-rdtmanager.lo `test -f 'rdtmanager.c' || echo '$(srcdir)/'`rdtmanager.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstrealmedia_la-rdtmanager.Tpo $(DEPDIR)/libgstrealmedia_la-rdtmanager.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='rdtmanager.c' object='libgstrealmedia_la-rdtmanager.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstrealmedia_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstrealmedia_la_CFLAGS) $(CFLAGS) -c -o libgstrealmedia_la-rdtmanager.lo `test -f 'rdtmanager.c' || echo '$(srcdir)/'`rdtmanager.c
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstrealmedia_la_CFLAGS) $(CFLAGS) -c -o libgstrealmedia_la-rdtmanager.lo `test -f 'rdtmanager.c' || echo '$(srcdir)/'`rdtmanager.c
libgstrealmedia_la-rtspreal.lo: rtspreal.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstrealmedia_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstrealmedia_la_CFLAGS) $(CFLAGS) -MT libgstrealmedia_la-rtspreal.lo -MD -MP -MF $(DEPDIR)/libgstrealmedia_la-rtspreal.Tpo -c -o libgstrealmedia_la-rtspreal.lo `test -f 'rtspreal.c' || echo '$(srcdir)/'`rtspreal.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstrealmedia_la_CFLAGS) $(CFLAGS) -MT libgstrealmedia_la-rtspreal.lo -MD -MP -MF $(DEPDIR)/libgstrealmedia_la-rtspreal.Tpo -c -o libgstrealmedia_la-rtspreal.lo `test -f 'rtspreal.c' || echo '$(srcdir)/'`rtspreal.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstrealmedia_la-rtspreal.Tpo $(DEPDIR)/libgstrealmedia_la-rtspreal.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='rtspreal.c' object='libgstrealmedia_la-rtspreal.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstrealmedia_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstrealmedia_la_CFLAGS) $(CFLAGS) -c -o libgstrealmedia_la-rtspreal.lo `test -f 'rtspreal.c' || echo '$(srcdir)/'`rtspreal.c
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstrealmedia_la_CFLAGS) $(CFLAGS) -c -o libgstrealmedia_la-rtspreal.lo `test -f 'rtspreal.c' || echo '$(srcdir)/'`rtspreal.c
libgstrealmedia_la-realhash.lo: realhash.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstrealmedia_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstrealmedia_la_CFLAGS) $(CFLAGS) -MT libgstrealmedia_la-realhash.lo -MD -MP -MF $(DEPDIR)/libgstrealmedia_la-realhash.Tpo -c -o libgstrealmedia_la-realhash.lo `test -f 'realhash.c' || echo '$(srcdir)/'`realhash.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstrealmedia_la_CFLAGS) $(CFLAGS) -MT libgstrealmedia_la-realhash.lo -MD -MP -MF $(DEPDIR)/libgstrealmedia_la-realhash.Tpo -c -o libgstrealmedia_la-realhash.lo `test -f 'realhash.c' || echo '$(srcdir)/'`realhash.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstrealmedia_la-realhash.Tpo $(DEPDIR)/libgstrealmedia_la-realhash.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='realhash.c' object='libgstrealmedia_la-realhash.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstrealmedia_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstrealmedia_la_CFLAGS) $(CFLAGS) -c -o libgstrealmedia_la-realhash.lo `test -f 'realhash.c' || echo '$(srcdir)/'`realhash.c
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstrealmedia_la_CFLAGS) $(CFLAGS) -c -o libgstrealmedia_la-realhash.lo `test -f 'realhash.c' || echo '$(srcdir)/'`realhash.c
libgstrealmedia_la-asmrules.lo: asmrules.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstrealmedia_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstrealmedia_la_CFLAGS) $(CFLAGS) -MT libgstrealmedia_la-asmrules.lo -MD -MP -MF $(DEPDIR)/libgstrealmedia_la-asmrules.Tpo -c -o libgstrealmedia_la-asmrules.lo `test -f 'asmrules.c' || echo '$(srcdir)/'`asmrules.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstrealmedia_la_CFLAGS) $(CFLAGS) -MT libgstrealmedia_la-asmrules.lo -MD -MP -MF $(DEPDIR)/libgstrealmedia_la-asmrules.Tpo -c -o libgstrealmedia_la-asmrules.lo `test -f 'asmrules.c' || echo '$(srcdir)/'`asmrules.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstrealmedia_la-asmrules.Tpo $(DEPDIR)/libgstrealmedia_la-asmrules.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='asmrules.c' object='libgstrealmedia_la-asmrules.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstrealmedia_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstrealmedia_la_CFLAGS) $(CFLAGS) -c -o libgstrealmedia_la-asmrules.lo `test -f 'asmrules.c' || echo '$(srcdir)/'`asmrules.c
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstrealmedia_la_CFLAGS) $(CFLAGS) -c -o libgstrealmedia_la-asmrules.lo `test -f 'asmrules.c' || echo '$(srcdir)/'`asmrules.c
libgstrealmedia_la-rdtjitterbuffer.lo: rdtjitterbuffer.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstrealmedia_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstrealmedia_la_CFLAGS) $(CFLAGS) -MT libgstrealmedia_la-rdtjitterbuffer.lo -MD -MP -MF $(DEPDIR)/libgstrealmedia_la-rdtjitterbuffer.Tpo -c -o libgstrealmedia_la-rdtjitterbuffer.lo `test -f 'rdtjitterbuffer.c' || echo '$(srcdir)/'`rdtjitterbuffer.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstrealmedia_la_CFLAGS) $(CFLAGS) -MT libgstrealmedia_la-rdtjitterbuffer.lo -MD -MP -MF $(DEPDIR)/libgstrealmedia_la-rdtjitterbuffer.Tpo -c -o libgstrealmedia_la-rdtjitterbuffer.lo `test -f 'rdtjitterbuffer.c' || echo '$(srcdir)/'`rdtjitterbuffer.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstrealmedia_la-rdtjitterbuffer.Tpo $(DEPDIR)/libgstrealmedia_la-rdtjitterbuffer.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='rdtjitterbuffer.c' object='libgstrealmedia_la-rdtjitterbuffer.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstrealmedia_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstrealmedia_la_CFLAGS) $(CFLAGS) -c -o libgstrealmedia_la-rdtjitterbuffer.lo `test -f 'rdtjitterbuffer.c' || echo '$(srcdir)/'`rdtjitterbuffer.c
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstrealmedia_la_CFLAGS) $(CFLAGS) -c -o libgstrealmedia_la-rdtjitterbuffer.lo `test -f 'rdtjitterbuffer.c' || echo '$(srcdir)/'`rdtjitterbuffer.c
libgstrealmedia_la-gstrdtbuffer.lo: gstrdtbuffer.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstrealmedia_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstrealmedia_la_CFLAGS) $(CFLAGS) -MT libgstrealmedia_la-gstrdtbuffer.lo -MD -MP -MF $(DEPDIR)/libgstrealmedia_la-gstrdtbuffer.Tpo -c -o libgstrealmedia_la-gstrdtbuffer.lo `test -f 'gstrdtbuffer.c' || echo '$(srcdir)/'`gstrdtbuffer.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstrealmedia_la_CFLAGS) $(CFLAGS) -MT libgstrealmedia_la-gstrdtbuffer.lo -MD -MP -MF $(DEPDIR)/libgstrealmedia_la-gstrdtbuffer.Tpo -c -o libgstrealmedia_la-gstrdtbuffer.lo `test -f 'gstrdtbuffer.c' || echo '$(srcdir)/'`gstrdtbuffer.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstrealmedia_la-gstrdtbuffer.Tpo $(DEPDIR)/libgstrealmedia_la-gstrdtbuffer.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gstrdtbuffer.c' object='libgstrealmedia_la-gstrdtbuffer.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstrealmedia_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstrealmedia_la_CFLAGS) $(CFLAGS) -c -o libgstrealmedia_la-gstrdtbuffer.lo `test -f 'gstrdtbuffer.c' || echo '$(srcdir)/'`gstrdtbuffer.c
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstrealmedia_la_CFLAGS) $(CFLAGS) -c -o libgstrealmedia_la-gstrdtbuffer.lo `test -f 'gstrdtbuffer.c' || echo '$(srcdir)/'`gstrdtbuffer.c
libgstrealmedia_la-pnmsrc.lo: pnmsrc.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstrealmedia_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstrealmedia_la_CFLAGS) $(CFLAGS) -MT libgstrealmedia_la-pnmsrc.lo -MD -MP -MF $(DEPDIR)/libgstrealmedia_la-pnmsrc.Tpo -c -o libgstrealmedia_la-pnmsrc.lo `test -f 'pnmsrc.c' || echo '$(srcdir)/'`pnmsrc.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstrealmedia_la_CFLAGS) $(CFLAGS) -MT libgstrealmedia_la-pnmsrc.lo -MD -MP -MF $(DEPDIR)/libgstrealmedia_la-pnmsrc.Tpo -c -o libgstrealmedia_la-pnmsrc.lo `test -f 'pnmsrc.c' || echo '$(srcdir)/'`pnmsrc.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstrealmedia_la-pnmsrc.Tpo $(DEPDIR)/libgstrealmedia_la-pnmsrc.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pnmsrc.c' object='libgstrealmedia_la-pnmsrc.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstrealmedia_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstrealmedia_la_CFLAGS) $(CFLAGS) -c -o libgstrealmedia_la-pnmsrc.lo `test -f 'pnmsrc.c' || echo '$(srcdir)/'`pnmsrc.c
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstrealmedia_la_CFLAGS) $(CFLAGS) -c -o libgstrealmedia_la-pnmsrc.lo `test -f 'pnmsrc.c' || echo '$(srcdir)/'`pnmsrc.c
libgstrealmedia_la-realmedia.lo: realmedia.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstrealmedia_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstrealmedia_la_CFLAGS) $(CFLAGS) -MT libgstrealmedia_la-realmedia.lo -MD -MP -MF $(DEPDIR)/libgstrealmedia_la-realmedia.Tpo -c -o libgstrealmedia_la-realmedia.lo `test -f 'realmedia.c' || echo '$(srcdir)/'`realmedia.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstrealmedia_la_CFLAGS) $(CFLAGS) -MT libgstrealmedia_la-realmedia.lo -MD -MP -MF $(DEPDIR)/libgstrealmedia_la-realmedia.Tpo -c -o libgstrealmedia_la-realmedia.lo `test -f 'realmedia.c' || echo '$(srcdir)/'`realmedia.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstrealmedia_la-realmedia.Tpo $(DEPDIR)/libgstrealmedia_la-realmedia.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='realmedia.c' object='libgstrealmedia_la-realmedia.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstrealmedia_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstrealmedia_la_CFLAGS) $(CFLAGS) -c -o libgstrealmedia_la-realmedia.lo `test -f 'realmedia.c' || echo '$(srcdir)/'`realmedia.c
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstrealmedia_la_CFLAGS) $(CFLAGS) -c -o libgstrealmedia_la-realmedia.lo `test -f 'realmedia.c' || echo '$(srcdir)/'`realmedia.c
asmrules-asmrules.o: asmrules.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(asmrules_CFLAGS) $(CFLAGS) -MT asmrules-asmrules.o -MD -MP -MF $(DEPDIR)/asmrules-asmrules.Tpo -c -o asmrules-asmrules.o `test -f 'asmrules.c' || echo '$(srcdir)/'`asmrules.c
diff --git a/gst/xingmux/Makefile.am b/gst/xingmux/Makefile.am
index 0190890..1531000 100644
--- a/gst/xingmux/Makefile.am
+++ b/gst/xingmux/Makefile.am
@@ -6,6 +6,5 @@
libgstxingmux_la_CFLAGS = $(GST_BASE_CFLAGS) $(GST_CFLAGS)
libgstxingmux_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS)
libgstxingmux_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstxingmux_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
noinst_HEADERS = gstxingmux.h
diff --git a/gst/xingmux/Makefile.in b/gst/xingmux/Makefile.in
index fac195d..013f363 100644
--- a/gst/xingmux/Makefile.in
+++ b/gst/xingmux/Makefile.in
@@ -171,8 +171,8 @@
am__v_lt_0 = --silent
am__v_lt_1 =
libgstxingmux_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
- $(libgstxingmux_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
- $(CCLD) $(libgstxingmux_la_CFLAGS) $(CFLAGS) \
+ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+ $(libgstxingmux_la_CFLAGS) $(CFLAGS) \
$(libgstxingmux_la_LDFLAGS) $(LDFLAGS) -o $@
AM_V_P = $(am__v_P_@AM_V@)
am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
@@ -285,6 +285,7 @@
ERROR_CFLAGS = @ERROR_CFLAGS@
ERROR_CXXFLAGS = @ERROR_CXXFLAGS@
EXEEXT = @EXEEXT@
+EXTRA_CFLAGS = @EXTRA_CFLAGS@
FFLAGS = @FFLAGS@
FGREP = @FGREP@
GCOV = @GCOV@
@@ -336,7 +337,6 @@
GST_PLUGINS_NONPORTED = @GST_PLUGINS_NONPORTED@
GST_PLUGINS_SELECTED = @GST_PLUGINS_SELECTED@
GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
-GST_PLUGIN_LIBTOOLFLAGS = @GST_PLUGIN_LIBTOOLFLAGS@
GST_PREFIX = @GST_PREFIX@
GST_REVISION = @GST_REVISION@
GST_TOOLS_DIR = @GST_TOOLS_DIR@
@@ -347,7 +347,6 @@
GTKDOC_REBASE = @GTKDOC_REBASE@
HAVE_CXX = @HAVE_CXX@
HAVE_DVDREAD = @HAVE_DVDREAD@
-HAVE_LAME = @HAVE_LAME@
HTML_DIR = @HTML_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
@@ -356,8 +355,6 @@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INTLLIBS = @INTLLIBS@
INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-LAME_CFLAGS = @LAME_CFLAGS@
-LAME_LIBS = @LAME_LIBS@
LD = @LD@
LDFLAGS = @LDFLAGS@
LIBICONV = @LIBICONV@
@@ -379,8 +376,6 @@
MKDIR_P = @MKDIR_P@
MPEG2DEC_CFLAGS = @MPEG2DEC_CFLAGS@
MPEG2DEC_LIBS = @MPEG2DEC_LIBS@
-MPG123_CFLAGS = @MPG123_CFLAGS@
-MPG123_LIBS = @MPG123_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_015 = @MSGFMT_015@
MSGMERGE = @MSGMERGE@
@@ -423,13 +418,13 @@
SIDPLAY_CFLAGS = @SIDPLAY_CFLAGS@
SIDPLAY_LIBS = @SIDPLAY_LIBS@
STRIP = @STRIP@
-TWOLAME_CFLAGS = @TWOLAME_CFLAGS@
-TWOLAME_LIBS = @TWOLAME_LIBS@
USE_NLS = @USE_NLS@
VALGRIND_CFLAGS = @VALGRIND_CFLAGS@
VALGRIND_LIBS = @VALGRIND_LIBS@
VALGRIND_PATH = @VALGRIND_PATH@
VERSION = @VERSION@
+VISIBILITY_CFLAGS = @VISIBILITY_CFLAGS@
+VISIBILITY_CXXFLAGS = @VISIBILITY_CXXFLAGS@
WARNING_CFLAGS = @WARNING_CFLAGS@
WARNING_CXXFLAGS = @WARNING_CXXFLAGS@
WIN32_LIBS = @WIN32_LIBS@
@@ -509,7 +504,6 @@
libgstxingmux_la_CFLAGS = $(GST_BASE_CFLAGS) $(GST_CFLAGS)
libgstxingmux_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS)
libgstxingmux_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstxingmux_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
noinst_HEADERS = gstxingmux.h
all: all-am
@@ -617,18 +611,18 @@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
libgstxingmux_la-plugin.lo: plugin.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstxingmux_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstxingmux_la_CFLAGS) $(CFLAGS) -MT libgstxingmux_la-plugin.lo -MD -MP -MF $(DEPDIR)/libgstxingmux_la-plugin.Tpo -c -o libgstxingmux_la-plugin.lo `test -f 'plugin.c' || echo '$(srcdir)/'`plugin.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstxingmux_la_CFLAGS) $(CFLAGS) -MT libgstxingmux_la-plugin.lo -MD -MP -MF $(DEPDIR)/libgstxingmux_la-plugin.Tpo -c -o libgstxingmux_la-plugin.lo `test -f 'plugin.c' || echo '$(srcdir)/'`plugin.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstxingmux_la-plugin.Tpo $(DEPDIR)/libgstxingmux_la-plugin.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='plugin.c' object='libgstxingmux_la-plugin.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstxingmux_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstxingmux_la_CFLAGS) $(CFLAGS) -c -o libgstxingmux_la-plugin.lo `test -f 'plugin.c' || echo '$(srcdir)/'`plugin.c
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstxingmux_la_CFLAGS) $(CFLAGS) -c -o libgstxingmux_la-plugin.lo `test -f 'plugin.c' || echo '$(srcdir)/'`plugin.c
libgstxingmux_la-gstxingmux.lo: gstxingmux.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstxingmux_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstxingmux_la_CFLAGS) $(CFLAGS) -MT libgstxingmux_la-gstxingmux.lo -MD -MP -MF $(DEPDIR)/libgstxingmux_la-gstxingmux.Tpo -c -o libgstxingmux_la-gstxingmux.lo `test -f 'gstxingmux.c' || echo '$(srcdir)/'`gstxingmux.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstxingmux_la_CFLAGS) $(CFLAGS) -MT libgstxingmux_la-gstxingmux.lo -MD -MP -MF $(DEPDIR)/libgstxingmux_la-gstxingmux.Tpo -c -o libgstxingmux_la-gstxingmux.lo `test -f 'gstxingmux.c' || echo '$(srcdir)/'`gstxingmux.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstxingmux_la-gstxingmux.Tpo $(DEPDIR)/libgstxingmux_la-gstxingmux.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gstxingmux.c' object='libgstxingmux_la-gstxingmux.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstxingmux_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstxingmux_la_CFLAGS) $(CFLAGS) -c -o libgstxingmux_la-gstxingmux.lo `test -f 'gstxingmux.c' || echo '$(srcdir)/'`gstxingmux.c
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstxingmux_la_CFLAGS) $(CFLAGS) -c -o libgstxingmux_la-gstxingmux.lo `test -f 'gstxingmux.c' || echo '$(srcdir)/'`gstxingmux.c
mostlyclean-libtool:
-rm -f *.lo
diff --git a/m4/Makefile.am b/m4/Makefile.am
index b037d1e..7097b16 100644
--- a/m4/Makefile.am
+++ b/m4/Makefile.am
@@ -19,7 +19,6 @@
EXTRA_DIST = \
a52.m4 \
aalib.m4 \
- as-liblame.m4 \
as-slurp-ffmpeg.m4 \
check-libheader.m4 \
freetype2.m4 \
diff --git a/m4/Makefile.in b/m4/Makefile.in
index 12d36a6..e914568 100644
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -198,6 +198,7 @@
ERROR_CFLAGS = @ERROR_CFLAGS@
ERROR_CXXFLAGS = @ERROR_CXXFLAGS@
EXEEXT = @EXEEXT@
+EXTRA_CFLAGS = @EXTRA_CFLAGS@
FFLAGS = @FFLAGS@
FGREP = @FGREP@
GCOV = @GCOV@
@@ -249,7 +250,6 @@
GST_PLUGINS_NONPORTED = @GST_PLUGINS_NONPORTED@
GST_PLUGINS_SELECTED = @GST_PLUGINS_SELECTED@
GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
-GST_PLUGIN_LIBTOOLFLAGS = @GST_PLUGIN_LIBTOOLFLAGS@
GST_PREFIX = @GST_PREFIX@
GST_REVISION = @GST_REVISION@
GST_TOOLS_DIR = @GST_TOOLS_DIR@
@@ -260,7 +260,6 @@
GTKDOC_REBASE = @GTKDOC_REBASE@
HAVE_CXX = @HAVE_CXX@
HAVE_DVDREAD = @HAVE_DVDREAD@
-HAVE_LAME = @HAVE_LAME@
HTML_DIR = @HTML_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
@@ -269,8 +268,6 @@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INTLLIBS = @INTLLIBS@
INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-LAME_CFLAGS = @LAME_CFLAGS@
-LAME_LIBS = @LAME_LIBS@
LD = @LD@
LDFLAGS = @LDFLAGS@
LIBICONV = @LIBICONV@
@@ -292,8 +289,6 @@
MKDIR_P = @MKDIR_P@
MPEG2DEC_CFLAGS = @MPEG2DEC_CFLAGS@
MPEG2DEC_LIBS = @MPEG2DEC_LIBS@
-MPG123_CFLAGS = @MPG123_CFLAGS@
-MPG123_LIBS = @MPG123_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_015 = @MSGFMT_015@
MSGMERGE = @MSGMERGE@
@@ -336,13 +331,13 @@
SIDPLAY_CFLAGS = @SIDPLAY_CFLAGS@
SIDPLAY_LIBS = @SIDPLAY_LIBS@
STRIP = @STRIP@
-TWOLAME_CFLAGS = @TWOLAME_CFLAGS@
-TWOLAME_LIBS = @TWOLAME_LIBS@
USE_NLS = @USE_NLS@
VALGRIND_CFLAGS = @VALGRIND_CFLAGS@
VALGRIND_LIBS = @VALGRIND_LIBS@
VALGRIND_PATH = @VALGRIND_PATH@
VERSION = @VERSION@
+VISIBILITY_CFLAGS = @VISIBILITY_CFLAGS@
+VISIBILITY_CXXFLAGS = @VISIBILITY_CXXFLAGS@
WARNING_CFLAGS = @WARNING_CFLAGS@
WARNING_CXXFLAGS = @WARNING_CXXFLAGS@
WIN32_LIBS = @WIN32_LIBS@
@@ -435,7 +430,6 @@
EXTRA_DIST = \
a52.m4 \
aalib.m4 \
- as-liblame.m4 \
as-slurp-ffmpeg.m4 \
check-libheader.m4 \
freetype2.m4 \
diff --git a/m4/as-liblame.m4 b/m4/as-liblame.m4
deleted file mode 100644
index ed7070c..0000000
--- a/m4/as-liblame.m4
+++ /dev/null
@@ -1,50 +0,0 @@
-# CFLAGS and library paths for LIBLAME
-# taken from Autostar Sandbox, http://autostars.sourceforge.net/
-# inspired by xmms.m4
-
-dnl Usage:
-dnl AM_PATH_LIBLAME([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
-dnl FIXME: version checking does not work currently
-dnl
-dnl Example:
-dnl AM_PATH_LIBLAME(3.89, , AC_MSG_ERROR([*** LIBLAME >= 3.89 not installed))
-dnl
-dnl Defines LIBLAME_LIBS
-dnl FIXME: should define LIBLAME_VERSION
-dnl
-
-AC_DEFUN([AM_PATH_LIBLAME],
-[
- dnl check for the library
- AC_CHECK_LIB(mp3lame, lame_init, HAVE_LIBLAME=yes, HAVE_LIBLAME=no, -lm)
- dnl check if lame.h is available in the standard location or not
- HAVE_LAME_H_STD=no
- AC_CHECK_HEADER(lame.h, HAVE_LAME_H_STD=no, :)
- AC_CHECK_HEADER(lame/lame.h, HAVE_LAME_H_STD=yes, :)
- AC_MSG_CHECKING(for lame.h in right location)
- if test "x$HAVE_LAME_H_STD" = "xyes"; then
- AC_MSG_RESULT(yes)
- else
- AC_MSG_RESULT(no)
- HAVE_LIBLAME=no
- if test "x$HAVE_LAME_H_STD"="xno"; then
- AC_MSG_WARN(lame.h found in include dir,)
- AC_MSG_WARN( while it should be in it's own lame/ dir !)
- fi
- fi
-
- dnl now do the actual "do we have it ?" test
- if test "x$HAVE_LIBLAME" = "xyes"; then
- LIBLAME_LIBS="-lmp3lame -lm"
- dnl execute what we have to because it's found
- ifelse([$2], , :, [$2])
- else
- LIBLAME_LIBS=""
- dnl execute what we have to because it's not found
- ifelse([$3], , :, [$3])
- fi
-
- dnl make variables available
- AC_SUBST(LIBLAME_LIBS)
- AC_SUBST(HAVE_LIBLAME)
-])
diff --git a/meson.build b/meson.build
index c1aecc2..87052a8 100644
--- a/meson.build
+++ b/meson.build
@@ -1,16 +1,16 @@
project('gst-plugins-ugly', 'c',
- version : '1.12.4',
+ version : '1.13.1',
meson_version : '>= 0.36.0',
default_options : [ 'warning_level=1',
'buildtype=debugoptimized' ])
gst_version = meson.project_version()
version_arr = gst_version.split('.')
-gst_version_major = version_arr[0]
-gst_version_minor = version_arr[1]
-gst_version_micro = version_arr[2]
-if version_arr.length() == 4
- gst_version_nano = version_arr[3]
+gst_version_major = version_arr[0].to_int()
+gst_version_minor = version_arr[1].to_int()
+gst_version_micro = version_arr[2].to_int()
+ if version_arr.length() == 4
+ gst_version_nano = version_arr[3].to_int()
else
gst_version_nano = 0
endif
@@ -42,6 +42,16 @@
noseh_link_args = []
endif
+# Symbol visibility
+if cc.has_argument('-fvisibility=hidden')
+ add_project_arguments('-fvisibility=hidden', language: 'c')
+endif
+
+# Disable strict aliasing
+if cc.has_argument('-fno-strict-aliasing')
+ add_project_arguments('-fno-strict-aliasing', language: 'c')
+endif
+
cdata = configuration_data()
check_headers = [
['HAVE_DLFCN_H', 'dlfcn.h'],
@@ -101,10 +111,22 @@
cdata.set('VERSION', '"@0@"'.format(gst_version))
cdata.set('PACKAGE', '"gst-plugins-ugly"')
cdata.set('GETTEXT_PACKAGE', '"gst-plugins-ugly-1.0"')
-cdata.set('GST_PACKAGE_NAME', '"GStreamer Ugly Plug-ins"')
-cdata.set('GST_PACKAGE_ORIGIN', '"Unknown package origin"')
cdata.set('GST_LICENSE', '"LGPL"')
+# GStreamer package name and origin url
+gst_package_name = get_option('with-package-name')
+if gst_package_name == ''
+ if gst_version_nano == 0
+ gst_package_name = 'GStreamer Ugly Plug-ins source release'
+ elif gst_version_nano == 1
+ gst_package_name = 'GStreamer Ugly Plug-ins git'
+ else
+ gst_package_name = 'GStreamer Ugly Plug-ins prerelease'
+ endif
+endif
+cdata.set_quoted('GST_PACKAGE_NAME', gst_package_name)
+cdata.set_quoted('GST_PACKAGE_ORIGIN', get_option('with-package-origin'))
+
# Mandatory GST deps
gst_dep = dependency('gstreamer-1.0', version : gst_req,
fallback : ['gstreamer', 'gst_dep'])
@@ -146,9 +168,7 @@
cdata.set('DISABLE_ORC', 1)
endif
-configure_file(input : 'config.h.meson',
- output : 'config.h',
- configuration : cdata)
+configure_file(output : 'config.h', configuration : cdata)
ugly_args = ['-DHAVE_CONFIG_H']
configinc = include_directories('.')
@@ -182,7 +202,11 @@
subdir('gst')
subdir('ext')
subdir('tests')
-subdir('po')
-python3 = find_program('python3')
+# xgettext is optional (on Windows for instance)
+if find_program('xgettext', required : false).found()
+ subdir('po')
+endif
+
+python3 = import('python3').find_python()
run_command(python3, '-c', 'import shutil; shutil.copy("hooks/pre-commit.hook", ".git/hooks/pre-commit")')
diff --git a/meson_options.txt b/meson_options.txt
index 07db661..7d8b60a 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,2 +1,6 @@
-option('x264_libraries', type : 'string', value : '', description : 'Colon separated list of additional x264 library paths, e.g. for 10-bit version')
-
+option('x264_libraries', type : 'string', value : '',
+ description : 'Colon separated list of additional x264 library paths, e.g. for 10-bit version')
+option('with-package-name', type : 'string',
+ description : 'package name to use in plugins')
+option('with-package-origin', type : 'string', value : 'Unknown package origin',
+ description : 'package origin URL to use in plugins')
diff --git a/pkgconfig/Makefile.in b/pkgconfig/Makefile.in
index 2edc993..99b4d5d 100644
--- a/pkgconfig/Makefile.in
+++ b/pkgconfig/Makefile.in
@@ -199,6 +199,7 @@
ERROR_CFLAGS = @ERROR_CFLAGS@
ERROR_CXXFLAGS = @ERROR_CXXFLAGS@
EXEEXT = @EXEEXT@
+EXTRA_CFLAGS = @EXTRA_CFLAGS@
FFLAGS = @FFLAGS@
FGREP = @FGREP@
GCOV = @GCOV@
@@ -250,7 +251,6 @@
GST_PLUGINS_NONPORTED = @GST_PLUGINS_NONPORTED@
GST_PLUGINS_SELECTED = @GST_PLUGINS_SELECTED@
GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
-GST_PLUGIN_LIBTOOLFLAGS = @GST_PLUGIN_LIBTOOLFLAGS@
GST_PREFIX = @GST_PREFIX@
GST_REVISION = @GST_REVISION@
GST_TOOLS_DIR = @GST_TOOLS_DIR@
@@ -261,7 +261,6 @@
GTKDOC_REBASE = @GTKDOC_REBASE@
HAVE_CXX = @HAVE_CXX@
HAVE_DVDREAD = @HAVE_DVDREAD@
-HAVE_LAME = @HAVE_LAME@
HTML_DIR = @HTML_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
@@ -270,8 +269,6 @@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INTLLIBS = @INTLLIBS@
INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-LAME_CFLAGS = @LAME_CFLAGS@
-LAME_LIBS = @LAME_LIBS@
LD = @LD@
LDFLAGS = @LDFLAGS@
LIBICONV = @LIBICONV@
@@ -293,8 +290,6 @@
MKDIR_P = @MKDIR_P@
MPEG2DEC_CFLAGS = @MPEG2DEC_CFLAGS@
MPEG2DEC_LIBS = @MPEG2DEC_LIBS@
-MPG123_CFLAGS = @MPG123_CFLAGS@
-MPG123_LIBS = @MPG123_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_015 = @MSGFMT_015@
MSGMERGE = @MSGMERGE@
@@ -337,13 +332,13 @@
SIDPLAY_CFLAGS = @SIDPLAY_CFLAGS@
SIDPLAY_LIBS = @SIDPLAY_LIBS@
STRIP = @STRIP@
-TWOLAME_CFLAGS = @TWOLAME_CFLAGS@
-TWOLAME_LIBS = @TWOLAME_LIBS@
USE_NLS = @USE_NLS@
VALGRIND_CFLAGS = @VALGRIND_CFLAGS@
VALGRIND_LIBS = @VALGRIND_LIBS@
VALGRIND_PATH = @VALGRIND_PATH@
VERSION = @VERSION@
+VISIBILITY_CFLAGS = @VISIBILITY_CFLAGS@
+VISIBILITY_CXXFLAGS = @VISIBILITY_CXXFLAGS@
WARNING_CFLAGS = @WARNING_CFLAGS@
WARNING_CXXFLAGS = @WARNING_CXXFLAGS@
WIN32_LIBS = @WIN32_LIBS@
diff --git a/po/POTFILES.in b/po/POTFILES.in
index e8c4066..5520fe1 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,5 +1,3 @@
ext/cdio/gstcdiocddasrc.c
ext/dvdread/dvdreadsrc.c
-ext/lame/gstlamemp3enc.c
-ext/twolame/gsttwolamemp2enc.c
gst/asfdemux/gstasfdemux.c
diff --git a/po/af.po b/po/af.po
index 21847eb..9fcba2f 100644
--- a/po/af.po
+++ b/po/af.po
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: gst-plugins 0.7.6\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n"
-"POT-Creation-Date: 2017-12-07 19:26+0200\n"
+"POT-Creation-Date: 2018-02-15 17:10+0000\n"
"PO-Revision-Date: 2004-03-18 14:16+0200\n"
"Last-Translator: Petri Jooste <rkwjpj@puk.ac.za>\n"
"Language-Team: Afrikaans <i18n@af.org.za>\n"
@@ -53,19 +53,6 @@
msgid "Could not read DVD."
msgstr "Kon nie skryf na lêer \"%s\" nie."
-msgid ""
-"Failed to configure LAME mp3 audio encoder. Check your encoding parameters."
-msgstr ""
-
-#, c-format
-msgid ""
-"The requested bitrate %d kbit/s for property '%s' is not allowed. The "
-"bitrate was changed to %d kbit/s."
-msgstr ""
-
-msgid "Failed to configure TwoLAME encoder. Check your encoding parameters."
-msgstr ""
-
msgid "This stream contains no data."
msgstr ""
diff --git a/po/az.po b/po/az.po
index 52549bd..f616040 100644
--- a/po/az.po
+++ b/po/az.po
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: gst-plugins-0.8.0\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n"
-"POT-Creation-Date: 2017-12-07 19:26+0200\n"
+"POT-Creation-Date: 2018-02-15 17:10+0000\n"
"PO-Revision-Date: 2004-03-19 18:29+0200\n"
"Last-Translator: Metin Amiroff <metin@karegen.com>\n"
"Language-Team: Azerbaijani <translation-team-az@lists.sourceforge.net>\n"
@@ -54,19 +54,6 @@
msgid "Could not read DVD."
msgstr "\"%s\" faylına yazıla bilmədi."
-msgid ""
-"Failed to configure LAME mp3 audio encoder. Check your encoding parameters."
-msgstr ""
-
-#, c-format
-msgid ""
-"The requested bitrate %d kbit/s for property '%s' is not allowed. The "
-"bitrate was changed to %d kbit/s."
-msgstr ""
-
-msgid "Failed to configure TwoLAME encoder. Check your encoding parameters."
-msgstr ""
-
msgid "This stream contains no data."
msgstr ""
diff --git a/po/bg.gmo b/po/bg.gmo
index 453907e..7ed233b 100644
--- a/po/bg.gmo
+++ b/po/bg.gmo
Binary files differ
diff --git a/po/bg.po b/po/bg.po
index 4cceee0..528625c 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: gst-plugins-ugly 1.7.1\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n"
-"POT-Creation-Date: 2017-12-07 19:26+0200\n"
+"POT-Creation-Date: 2018-02-15 17:10+0000\n"
"PO-Revision-Date: 2016-02-21 21:03+0200\n"
"Last-Translator: Alexander Shopov <ash@kambanaria.org>\n"
"Language-Team: Bulgarian <dict@ludost.net>\n"
@@ -56,26 +56,27 @@
msgid "Could not read DVD."
msgstr "DVD-то не може да бъде прочетено."
-msgid ""
-"Failed to configure LAME mp3 audio encoder. Check your encoding parameters."
-msgstr ""
-"Кодерът за mp3 — LAME не може да бъде настроен. Проверете настройките за "
-"кодиране."
-
-#, c-format
-msgid ""
-"The requested bitrate %d kbit/s for property '%s' is not allowed. The "
-"bitrate was changed to %d kbit/s."
-msgstr ""
-"Поисканата честота в битове %d kbit/s за свойството „%s“ не е позволена. Тя "
-"бе променена на %d kbit/s."
-
-msgid "Failed to configure TwoLAME encoder. Check your encoding parameters."
-msgstr ""
-"Кодерът TwoLAME не може да бъде настроен. Проверете настройките за кодиране."
-
msgid "This stream contains no data."
msgstr "Потокът не съдържа данни."
+#~ msgid ""
+#~ "Failed to configure LAME mp3 audio encoder. Check your encoding "
+#~ "parameters."
+#~ msgstr ""
+#~ "Кодерът за mp3 — LAME не може да бъде настроен. Проверете настройките за "
+#~ "кодиране."
+
+#~ msgid ""
+#~ "The requested bitrate %d kbit/s for property '%s' is not allowed. The "
+#~ "bitrate was changed to %d kbit/s."
+#~ msgstr ""
+#~ "Поисканата честота в битове %d kbit/s за свойството „%s“ не е позволена. "
+#~ "Тя бе променена на %d kbit/s."
+
+#~ msgid "Failed to configure TwoLAME encoder. Check your encoding parameters."
+#~ msgstr ""
+#~ "Кодерът TwoLAME не може да бъде настроен. Проверете настройките за "
+#~ "кодиране."
+
#~ msgid "Internal data stream error."
#~ msgstr "Вътрешна грешка в потока от данни."
diff --git a/po/ca.gmo b/po/ca.gmo
index 3dd4529..e4d5218 100644
--- a/po/ca.gmo
+++ b/po/ca.gmo
Binary files differ
diff --git a/po/ca.po b/po/ca.po
index 93ab8f4..1956285 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: gst-plugins-ugly 0.10.17.2\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n"
-"POT-Creation-Date: 2017-12-07 19:26+0200\n"
+"POT-Creation-Date: 2018-02-15 17:10+0000\n"
"PO-Revision-Date: 2012-01-01 14:19+0100\n"
"Last-Translator: Gil Forcada <gforcada@gnome.org>\n"
"Language-Team: Catalan <ca@dodds.net>\n"
@@ -57,28 +57,28 @@
msgid "Could not read DVD."
msgstr "No s'ha pogut llegir el DVD."
-#, fuzzy
-msgid ""
-"Failed to configure LAME mp3 audio encoder. Check your encoding parameters."
-msgstr ""
-"No s'ha pogut configurar el codificador LAME. Comproveu els paràmetres de "
-"codificació."
-
-#, c-format
-msgid ""
-"The requested bitrate %d kbit/s for property '%s' is not allowed. The "
-"bitrate was changed to %d kbit/s."
-msgstr ""
-"La taxa de bits %d kbit/s per a la propietat «%s» no és permesa. S'ha "
-"canviat la taxa de bits a %d kbit/s."
-
-msgid "Failed to configure TwoLAME encoder. Check your encoding parameters."
-msgstr ""
-"No s'ha pogut configurar el codificador TwoLAME. Comproveu els paràmetres de "
-"codificació."
-
msgid "This stream contains no data."
msgstr "Aquest flux no conté dades."
+#, fuzzy
+#~ msgid ""
+#~ "Failed to configure LAME mp3 audio encoder. Check your encoding "
+#~ "parameters."
+#~ msgstr ""
+#~ "No s'ha pogut configurar el codificador LAME. Comproveu els paràmetres de "
+#~ "codificació."
+
+#~ msgid ""
+#~ "The requested bitrate %d kbit/s for property '%s' is not allowed. The "
+#~ "bitrate was changed to %d kbit/s."
+#~ msgstr ""
+#~ "La taxa de bits %d kbit/s per a la propietat «%s» no és permesa. S'ha "
+#~ "canviat la taxa de bits a %d kbit/s."
+
+#~ msgid "Failed to configure TwoLAME encoder. Check your encoding parameters."
+#~ msgstr ""
+#~ "No s'ha pogut configurar el codificador TwoLAME. Comproveu els paràmetres "
+#~ "de codificació."
+
#~ msgid "Internal data stream error."
#~ msgstr "S'ha produït un error intern de flux de dades."
diff --git a/po/cs.gmo b/po/cs.gmo
index 992f553..7d695fc 100644
--- a/po/cs.gmo
+++ b/po/cs.gmo
Binary files differ
diff --git a/po/cs.po b/po/cs.po
index bf6acd7..a8e3bb1 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -11,7 +11,7 @@
msgstr ""
"Project-Id-Version: gst-plugins-ugly 1.0.3\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n"
-"POT-Creation-Date: 2017-12-07 19:26+0200\n"
+"POT-Creation-Date: 2018-02-15 17:10+0000\n"
"PO-Revision-Date: 2013-09-07 07:06+0200\n"
"Last-Translator: Marek Černocký <marek@manet.cz>\n"
"Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n"
@@ -60,24 +60,25 @@
msgid "Could not read DVD."
msgstr "Nezdařilo se čtení DVD."
-msgid ""
-"Failed to configure LAME mp3 audio encoder. Check your encoding parameters."
-msgstr ""
-"Selhalo nastavení zvukového kodéru LAME mp3. Zkontrolujte parametry kódování."
-
-#, c-format
-msgid ""
-"The requested bitrate %d kbit/s for property '%s' is not allowed. The "
-"bitrate was changed to %d kbit/s."
-msgstr ""
-"Požadovaný datový tok %d kb/s za sekundu není u vlastnosti „%s“ povolen. "
-"Datový tok byl změněn na %d kb/s."
-
-msgid "Failed to configure TwoLAME encoder. Check your encoding parameters."
-msgstr "Selhalo nastavení kodéru TwoLAME. Zkontrolujte parametry kódování."
-
msgid "This stream contains no data."
msgstr "Tento proud neobsahuje žádná data."
+#~ msgid ""
+#~ "Failed to configure LAME mp3 audio encoder. Check your encoding "
+#~ "parameters."
+#~ msgstr ""
+#~ "Selhalo nastavení zvukového kodéru LAME mp3. Zkontrolujte parametry "
+#~ "kódování."
+
+#~ msgid ""
+#~ "The requested bitrate %d kbit/s for property '%s' is not allowed. The "
+#~ "bitrate was changed to %d kbit/s."
+#~ msgstr ""
+#~ "Požadovaný datový tok %d kb/s za sekundu není u vlastnosti „%s“ povolen. "
+#~ "Datový tok byl změněn na %d kb/s."
+
+#~ msgid "Failed to configure TwoLAME encoder. Check your encoding parameters."
+#~ msgstr "Selhalo nastavení kodéru TwoLAME. Zkontrolujte parametry kódování."
+
#~ msgid "Internal data stream error."
#~ msgstr "Interní chyba datového proudu."
diff --git a/po/da.gmo b/po/da.gmo
index 03f261d..2de9320 100644
--- a/po/da.gmo
+++ b/po/da.gmo
Binary files differ
diff --git a/po/da.po b/po/da.po
index 1b29376..db9fd6c 100644
--- a/po/da.po
+++ b/po/da.po
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: gst-plugins-ugly-1.0.3\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n"
-"POT-Creation-Date: 2017-12-07 19:26+0200\n"
+"POT-Creation-Date: 2018-02-15 17:10+0000\n"
"PO-Revision-Date: 2012-12-09 03:56+0100\n"
"Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
"Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
@@ -56,27 +56,28 @@
msgid "Could not read DVD."
msgstr "Kunne ikke læse dvd."
-msgid ""
-"Failed to configure LAME mp3 audio encoder. Check your encoding parameters."
-msgstr ""
-"Kunne ikke konfigurere LAME mp3-lydindkoderen. Kontroller dine "
-"indkoderparametre."
-
-#, c-format
-msgid ""
-"The requested bitrate %d kbit/s for property '%s' is not allowed. The "
-"bitrate was changed to %d kbit/s."
-msgstr ""
-"Den krævede bithastighed %d kbit/s for egenskab %s er ikke tilladt. "
-"Bithastigheden blev ændret til %d kbit/s."
-
-msgid "Failed to configure TwoLAME encoder. Check your encoding parameters."
-msgstr ""
-"Kunne ikke konfigurere TwoLAME-indkoderen. Kontroller dine indkoderparametre."
-
msgid "This stream contains no data."
msgstr "Denne strøm indeholder ingen data."
+#~ msgid ""
+#~ "Failed to configure LAME mp3 audio encoder. Check your encoding "
+#~ "parameters."
+#~ msgstr ""
+#~ "Kunne ikke konfigurere LAME mp3-lydindkoderen. Kontroller dine "
+#~ "indkoderparametre."
+
+#~ msgid ""
+#~ "The requested bitrate %d kbit/s for property '%s' is not allowed. The "
+#~ "bitrate was changed to %d kbit/s."
+#~ msgstr ""
+#~ "Den krævede bithastighed %d kbit/s for egenskab %s er ikke tilladt. "
+#~ "Bithastigheden blev ændret til %d kbit/s."
+
+#~ msgid "Failed to configure TwoLAME encoder. Check your encoding parameters."
+#~ msgstr ""
+#~ "Kunne ikke konfigurere TwoLAME-indkoderen. Kontroller dine "
+#~ "indkoderparametre."
+
#~ msgid "Internal data stream error."
#~ msgstr "Intern datastrømfejl."
diff --git a/po/de.gmo b/po/de.gmo
index b04b203..d4a77c4 100644
--- a/po/de.gmo
+++ b/po/de.gmo
Binary files differ
diff --git a/po/de.po b/po/de.po
index 3f7d69d..3f39a3f 100644
--- a/po/de.po
+++ b/po/de.po
@@ -13,7 +13,7 @@
msgstr ""
"Project-Id-Version: gst-plugins-ugly 1.3.2\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n"
-"POT-Creation-Date: 2017-12-07 19:26+0200\n"
+"POT-Creation-Date: 2018-02-15 17:10+0000\n"
"PO-Revision-Date: 2014-05-22 18:29+0100\n"
"Last-Translator: Christian Kirbach <christian.kirbach@gmail.com>\n"
"Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
@@ -63,28 +63,28 @@
msgid "Could not read DVD."
msgstr "DVD konnten nicht gelesen werden."
-msgid ""
-"Failed to configure LAME mp3 audio encoder. Check your encoding parameters."
-msgstr ""
-"Konfigurieren des MP3 Audio-Enkodierers »LAME« schlug fehl. Überprüfen Sie "
-"die Parameter zum Enkodieren."
-
-#, c-format
-msgid ""
-"The requested bitrate %d kbit/s for property '%s' is not allowed. The "
-"bitrate was changed to %d kbit/s."
-msgstr ""
-"Die angeforderte Bitrate von %d kBit/s ist für die Eigenschaft »%s« nicht "
-"erlaubt. Die Bitrate wurde auf %d kBit/s abgeändert."
-
-msgid "Failed to configure TwoLAME encoder. Check your encoding parameters."
-msgstr ""
-"Konfigurieren des Enkodierers »TwoLAME« schlug fehl. Überprüfen Sie die "
-"Parameter zum Enkodieren. "
-
msgid "This stream contains no data."
msgstr "Dieser Strom enthält keine Daten."
+#~ msgid ""
+#~ "Failed to configure LAME mp3 audio encoder. Check your encoding "
+#~ "parameters."
+#~ msgstr ""
+#~ "Konfigurieren des MP3 Audio-Enkodierers »LAME« schlug fehl. Überprüfen "
+#~ "Sie die Parameter zum Enkodieren."
+
+#~ msgid ""
+#~ "The requested bitrate %d kbit/s for property '%s' is not allowed. The "
+#~ "bitrate was changed to %d kbit/s."
+#~ msgstr ""
+#~ "Die angeforderte Bitrate von %d kBit/s ist für die Eigenschaft »%s« nicht "
+#~ "erlaubt. Die Bitrate wurde auf %d kBit/s abgeändert."
+
+#~ msgid "Failed to configure TwoLAME encoder. Check your encoding parameters."
+#~ msgstr ""
+#~ "Konfigurieren des Enkodierers »TwoLAME« schlug fehl. Überprüfen Sie die "
+#~ "Parameter zum Enkodieren. "
+
#~ msgid "Internal data stream error."
#~ msgstr "Interner Datenstromfehler."
diff --git a/po/el.gmo b/po/el.gmo
index 1f53670..10d8e50 100644
--- a/po/el.gmo
+++ b/po/el.gmo
Binary files differ
diff --git a/po/el.po b/po/el.po
index efae585..fbca162 100644
--- a/po/el.po
+++ b/po/el.po
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: gst-plugins-ugly 0.10.17.2\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n"
-"POT-Creation-Date: 2017-12-07 19:26+0200\n"
+"POT-Creation-Date: 2018-02-15 17:10+0000\n"
"PO-Revision-Date: 2012-03-18 01:04+0100\n"
"Last-Translator: Savvas Radevic <vicedar@gmail.com>\n"
"Language-Team: Greek <team@lists.gnome.gr>\n"
@@ -55,28 +55,28 @@
msgid "Could not read DVD."
msgstr "Δεν είναι δυνατή η ανάγνωση του DVD."
-#, fuzzy
-msgid ""
-"Failed to configure LAME mp3 audio encoder. Check your encoding parameters."
-msgstr ""
-"Αδυναμία ρύθμισης του κωδικοποιητή LAME. Ελέγξτε τις παραμέτρους "
-"κωδικοποίησης."
-
-#, c-format
-msgid ""
-"The requested bitrate %d kbit/s for property '%s' is not allowed. The "
-"bitrate was changed to %d kbit/s."
-msgstr ""
-"Ο αιτούμενος ρυθμός μετάδοσης %d kbit/s για την ιδιοκτησία '%s' δεν είναι "
-"επιτρεπτός.Ορυθμός μετάδοσης άλλαξε σε %d kbit/s."
-
-msgid "Failed to configure TwoLAME encoder. Check your encoding parameters."
-msgstr ""
-"Αδυναμία ρύθμισης του κωδικοποιητή TwoLAME. Ελέγξτε τις παραμέτρους "
-"κωδικοποίησης."
-
msgid "This stream contains no data."
msgstr "Η ροή αυτή δεν περιέχει καθόλου δεδομένα."
+#, fuzzy
+#~ msgid ""
+#~ "Failed to configure LAME mp3 audio encoder. Check your encoding "
+#~ "parameters."
+#~ msgstr ""
+#~ "Αδυναμία ρύθμισης του κωδικοποιητή LAME. Ελέγξτε τις παραμέτρους "
+#~ "κωδικοποίησης."
+
+#~ msgid ""
+#~ "The requested bitrate %d kbit/s for property '%s' is not allowed. The "
+#~ "bitrate was changed to %d kbit/s."
+#~ msgstr ""
+#~ "Ο αιτούμενος ρυθμός μετάδοσης %d kbit/s για την ιδιοκτησία '%s' δεν είναι "
+#~ "επιτρεπτός.Ορυθμός μετάδοσης άλλαξε σε %d kbit/s."
+
+#~ msgid "Failed to configure TwoLAME encoder. Check your encoding parameters."
+#~ msgstr ""
+#~ "Αδυναμία ρύθμισης του κωδικοποιητή TwoLAME. Ελέγξτε τις παραμέτρους "
+#~ "κωδικοποίησης."
+
#~ msgid "Internal data stream error."
#~ msgstr "Εσωτερικό σφάλμα ροής δεδομένων."
diff --git a/po/en_GB.po b/po/en_GB.po
index 2dcf12f..f40b440 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: gst-plugins 0.8.1\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n"
-"POT-Creation-Date: 2017-12-07 19:26+0200\n"
+"POT-Creation-Date: 2018-02-15 17:10+0000\n"
"PO-Revision-Date: 2004-04-26 10:41-0400\n"
"Last-Translator: Gareth Owen <gowen72@yahoo.com>\n"
"Language-Team: English (British) <en_gb@li.org>\n"
@@ -52,19 +52,6 @@
msgid "Could not read DVD."
msgstr "Could not write to file \"%s\"."
-msgid ""
-"Failed to configure LAME mp3 audio encoder. Check your encoding parameters."
-msgstr ""
-
-#, c-format
-msgid ""
-"The requested bitrate %d kbit/s for property '%s' is not allowed. The "
-"bitrate was changed to %d kbit/s."
-msgstr ""
-
-msgid "Failed to configure TwoLAME encoder. Check your encoding parameters."
-msgstr ""
-
msgid "This stream contains no data."
msgstr ""
diff --git a/po/eo.gmo b/po/eo.gmo
index 84ee8cd..1b25c4f 100644
--- a/po/eo.gmo
+++ b/po/eo.gmo
Binary files differ
diff --git a/po/eo.po b/po/eo.po
index 162a697..877b097 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: gst-plugins-ugly 1.4.1\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n"
-"POT-Creation-Date: 2017-12-07 19:26+0200\n"
+"POT-Creation-Date: 2018-02-15 17:10+0000\n"
"PO-Revision-Date: 2014-09-21 21:03+0200\n"
"Last-Translator: Benno Schulenberg <benno@vertaalt.nl>\n"
"Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
@@ -57,23 +57,24 @@
msgid "Could not read DVD."
msgstr "Ne eblis legi la DVD-n."
-msgid ""
-"Failed to configure LAME mp3 audio encoder. Check your encoding parameters."
-msgstr "Fiaskis agordi la LAME-kodilon. Kontrolu viajn kodad-parametrojn."
-
-#, c-format
-msgid ""
-"The requested bitrate %d kbit/s for property '%s' is not allowed. The "
-"bitrate was changed to %d kbit/s."
-msgstr ""
-"La petita bitrapido je %d kbit/s ne estas permesata por la atributo \"%s\". "
-"La bitrapido estas ŝanĝite al %d kbit/s."
-
-msgid "Failed to configure TwoLAME encoder. Check your encoding parameters."
-msgstr "Fiaskis agordi la TwoLAME-kodilon. Kontrolu viajn kodad-parametrojn."
-
msgid "This stream contains no data."
msgstr "Tiu fluo enhavas neniun datumon."
+#~ msgid ""
+#~ "Failed to configure LAME mp3 audio encoder. Check your encoding "
+#~ "parameters."
+#~ msgstr "Fiaskis agordi la LAME-kodilon. Kontrolu viajn kodad-parametrojn."
+
+#~ msgid ""
+#~ "The requested bitrate %d kbit/s for property '%s' is not allowed. The "
+#~ "bitrate was changed to %d kbit/s."
+#~ msgstr ""
+#~ "La petita bitrapido je %d kbit/s ne estas permesata por la atributo \"%s"
+#~ "\". La bitrapido estas ŝanĝite al %d kbit/s."
+
+#~ msgid "Failed to configure TwoLAME encoder. Check your encoding parameters."
+#~ msgstr ""
+#~ "Fiaskis agordi la TwoLAME-kodilon. Kontrolu viajn kodad-parametrojn."
+
#~ msgid "Internal data stream error."
#~ msgstr "Interna datum-flu-eraro."
diff --git a/po/es.gmo b/po/es.gmo
index e041f25..2057f59 100644
--- a/po/es.gmo
+++ b/po/es.gmo
Binary files differ
diff --git a/po/es.po b/po/es.po
index 2328a3e..4cac7db 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: gst-plugins-ugly 0.10.17.2\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n"
-"POT-Creation-Date: 2017-12-07 19:26+0200\n"
+"POT-Creation-Date: 2018-02-15 17:10+0000\n"
"PO-Revision-Date: 2011-10-02 15:45+0200\n"
"Last-Translator: Jorge González González <aloriel@gmail.com>\n"
"Language-Team: Spanish <es@li.org>\n"
@@ -56,29 +56,29 @@
msgid "Could not read DVD."
msgstr "No se pudo leer el DVD."
-#, fuzzy
-msgid ""
-"Failed to configure LAME mp3 audio encoder. Check your encoding parameters."
-msgstr ""
-"Falló al configurar el codificador LAME. Compruebe sus parámetros de "
-"codificación."
-
-#, c-format
-msgid ""
-"The requested bitrate %d kbit/s for property '%s' is not allowed. The "
-"bitrate was changed to %d kbit/s."
-msgstr ""
-"La tasa de bits %d kbps solicitada para la propiedad «%s» no está permitida. "
-"La tasa de bits se cambió a %d kbps."
-
-msgid "Failed to configure TwoLAME encoder. Check your encoding parameters."
-msgstr ""
-"Falló al configurar el codificador TwoLAME. Compruebe sus parámetros de "
-"codificación."
-
msgid "This stream contains no data."
msgstr "Este medio no contiene datos."
+#, fuzzy
+#~ msgid ""
+#~ "Failed to configure LAME mp3 audio encoder. Check your encoding "
+#~ "parameters."
+#~ msgstr ""
+#~ "Falló al configurar el codificador LAME. Compruebe sus parámetros de "
+#~ "codificación."
+
+#~ msgid ""
+#~ "The requested bitrate %d kbit/s for property '%s' is not allowed. The "
+#~ "bitrate was changed to %d kbit/s."
+#~ msgstr ""
+#~ "La tasa de bits %d kbps solicitada para la propiedad «%s» no está "
+#~ "permitida. La tasa de bits se cambió a %d kbps."
+
+#~ msgid "Failed to configure TwoLAME encoder. Check your encoding parameters."
+#~ msgstr ""
+#~ "Falló al configurar el codificador TwoLAME. Compruebe sus parámetros de "
+#~ "codificación."
+
#~ msgid "Internal data stream error."
#~ msgstr "Error del flujo de datos interno."
diff --git a/po/eu.gmo b/po/eu.gmo
index 0e1344a..1522e6b 100644
--- a/po/eu.gmo
+++ b/po/eu.gmo
Binary files differ
diff --git a/po/eu.po b/po/eu.po
index 9a5f134..43b7e4d 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: gst-plugins-ugly-0.10.13.2\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n"
-"POT-Creation-Date: 2017-12-07 19:26+0200\n"
+"POT-Creation-Date: 2018-02-15 17:10+0000\n"
"PO-Revision-Date: 2010-03-07 13:12+0200\n"
"Last-Translator: Mikel Olasagasti Uranga <hey_neken@mundurat.net>\n"
"Language-Team: Basque <translation-team-eu@lists.sourceforge.net>\n"
@@ -57,29 +57,29 @@
msgid "Could not read DVD."
msgstr "Ezin izan da DVDa ireki"
-#, fuzzy
-msgid ""
-"Failed to configure LAME mp3 audio encoder. Check your encoding parameters."
-msgstr ""
-"Huts egin du TwoLAME kodetzailea konfiguratzean. Begiratu kodetze-"
-"parametroak ondo dauden."
-
-#, c-format
-msgid ""
-"The requested bitrate %d kbit/s for property '%s' is not allowed. The "
-"bitrate was changed to %d kbit/s."
-msgstr ""
-"Ez da onartzen '%2$s' propietatearentzat eskatutako %1$d kbit/s-ko bit-"
-"emaria. Bit-emaria aldatu egin da, eta orain %3$d kbit/s-koa da."
-
-msgid "Failed to configure TwoLAME encoder. Check your encoding parameters."
-msgstr ""
-"Huts egin du TwoLAME kodetzailea konfiguratzean. Begiratu kodetze-"
-"parametroak ondo dauden."
-
msgid "This stream contains no data."
msgstr "Korronte honek ez du daturik."
+#, fuzzy
+#~ msgid ""
+#~ "Failed to configure LAME mp3 audio encoder. Check your encoding "
+#~ "parameters."
+#~ msgstr ""
+#~ "Huts egin du TwoLAME kodetzailea konfiguratzean. Begiratu kodetze-"
+#~ "parametroak ondo dauden."
+
+#~ msgid ""
+#~ "The requested bitrate %d kbit/s for property '%s' is not allowed. The "
+#~ "bitrate was changed to %d kbit/s."
+#~ msgstr ""
+#~ "Ez da onartzen '%2$s' propietatearentzat eskatutako %1$d kbit/s-ko bit-"
+#~ "emaria. Bit-emaria aldatu egin da, eta orain %3$d kbit/s-koa da."
+
+#~ msgid "Failed to configure TwoLAME encoder. Check your encoding parameters."
+#~ msgstr ""
+#~ "Huts egin du TwoLAME kodetzailea konfiguratzean. Begiratu kodetze-"
+#~ "parametroak ondo dauden."
+
#~ msgid "Internal data stream error."
#~ msgstr "Datu-korrontearen barne-errorea."
diff --git a/po/fi.gmo b/po/fi.gmo
index 436f0e3..56e1e36 100644
--- a/po/fi.gmo
+++ b/po/fi.gmo
Binary files differ
diff --git a/po/fi.po b/po/fi.po
index 9185d41..041f75a 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -11,7 +11,7 @@
msgstr ""
"Project-Id-Version: gst-plugins-ugly 0.10.10.2\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n"
-"POT-Creation-Date: 2017-12-07 19:26+0200\n"
+"POT-Creation-Date: 2018-02-15 17:10+0000\n"
"PO-Revision-Date: 2009-03-10 20:41+0200\n"
"Last-Translator: Tommi Vainikainen <Tommi.Vainikainen@iki.fi>\n"
"Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
@@ -59,25 +59,25 @@
msgid "Could not read DVD."
msgstr "DVD:tä ei voitu avata"
-#, fuzzy
-msgid ""
-"Failed to configure LAME mp3 audio encoder. Check your encoding parameters."
-msgstr "TwoLAME-kodekkia ei voitu määritellä. Tarkista kodekkiasetuksesi."
-
-#, c-format
-msgid ""
-"The requested bitrate %d kbit/s for property '%s' is not allowed. The "
-"bitrate was changed to %d kbit/s."
-msgstr ""
-"Pyydetty bittinopeus %d kb/s ominaisuudelle \"%s\" ei ole sallittu. "
-"Bittinopeus asetettiin arvoon %d kb/s."
-
-msgid "Failed to configure TwoLAME encoder. Check your encoding parameters."
-msgstr "TwoLAME-kodekkia ei voitu määritellä. Tarkista kodekkiasetuksesi."
-
msgid "This stream contains no data."
msgstr "Virta ei sisällä tietoa."
+#, fuzzy
+#~ msgid ""
+#~ "Failed to configure LAME mp3 audio encoder. Check your encoding "
+#~ "parameters."
+#~ msgstr "TwoLAME-kodekkia ei voitu määritellä. Tarkista kodekkiasetuksesi."
+
+#~ msgid ""
+#~ "The requested bitrate %d kbit/s for property '%s' is not allowed. The "
+#~ "bitrate was changed to %d kbit/s."
+#~ msgstr ""
+#~ "Pyydetty bittinopeus %d kb/s ominaisuudelle \"%s\" ei ole sallittu. "
+#~ "Bittinopeus asetettiin arvoon %d kb/s."
+
+#~ msgid "Failed to configure TwoLAME encoder. Check your encoding parameters."
+#~ msgstr "TwoLAME-kodekkia ei voitu määritellä. Tarkista kodekkiasetuksesi."
+
#~ msgid "Internal data stream error."
#~ msgstr "Sisäinen tietovirtavirhe."
diff --git a/po/fr.gmo b/po/fr.gmo
index 76eda22..6dce347 100644
--- a/po/fr.gmo
+++ b/po/fr.gmo
Binary files differ
diff --git a/po/fr.po b/po/fr.po
index 8b2cf5d..443d96c 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: gst-plugins-ugly 1.7.1\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n"
-"POT-Creation-Date: 2017-12-07 19:26+0200\n"
+"POT-Creation-Date: 2018-02-15 17:10+0000\n"
"PO-Revision-Date: 2015-12-27 01:51+0100\n"
"Last-Translator: Stéphane Aulery <lkppo@free.fr>\n"
"Language-Team: French <traduc@traduc.org>\n"
@@ -56,27 +56,27 @@
msgid "Could not read DVD."
msgstr "Impossible de lire le DVD."
-msgid ""
-"Failed to configure LAME mp3 audio encoder. Check your encoding parameters."
-msgstr ""
-"La configuration de l’encodeur audio mp3 LAME a échoué. Vérifiez vos "
-"paramètres d’encodage."
-
-#, c-format
-msgid ""
-"The requested bitrate %d kbit/s for property '%s' is not allowed. The "
-"bitrate was changed to %d kbit/s."
-msgstr ""
-"Le débit de transfert demandé de %d kbit/s pour la propriété « %s » n’est "
-"pas autorisé. Le débit de transfert a été défini à %d kbits/s."
-
-msgid "Failed to configure TwoLAME encoder. Check your encoding parameters."
-msgstr ""
-"La configuration de l’encodeur TwoLAME a échoué. Vérifiez vos paramètres "
-"d’encodage."
-
msgid "This stream contains no data."
msgstr "Ce flux ne contient aucune données."
+#~ msgid ""
+#~ "Failed to configure LAME mp3 audio encoder. Check your encoding "
+#~ "parameters."
+#~ msgstr ""
+#~ "La configuration de l’encodeur audio mp3 LAME a échoué. Vérifiez vos "
+#~ "paramètres d’encodage."
+
+#~ msgid ""
+#~ "The requested bitrate %d kbit/s for property '%s' is not allowed. The "
+#~ "bitrate was changed to %d kbit/s."
+#~ msgstr ""
+#~ "Le débit de transfert demandé de %d kbit/s pour la propriété « %s » n’est "
+#~ "pas autorisé. Le débit de transfert a été défini à %d kbits/s."
+
+#~ msgid "Failed to configure TwoLAME encoder. Check your encoding parameters."
+#~ msgstr ""
+#~ "La configuration de l’encodeur TwoLAME a échoué. Vérifiez vos paramètres "
+#~ "d’encodage."
+
#~ msgid "Internal data stream error."
#~ msgstr "Erreur du flux de données interne."
diff --git a/po/fur.gmo b/po/fur.gmo
index 8b59a34..221d752 100644
--- a/po/fur.gmo
+++ b/po/fur.gmo
Binary files differ
diff --git a/po/fur.po b/po/fur.po
index f1e0293..3fcf486 100644
--- a/po/fur.po
+++ b/po/fur.po
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: gst-plugins-ugly 1.10.0\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n"
-"POT-Creation-Date: 2017-12-07 19:26+0200\n"
+"POT-Creation-Date: 2018-02-15 17:10+0000\n"
"PO-Revision-Date: 2016-11-30 16:23+0100\n"
"Last-Translator: Fabio Tomat <f.t.public@gmail.com>\n"
"Language-Team: Friulian <f.t.public@gmail.com>\n"
@@ -56,24 +56,24 @@
msgid "Could not read DVD."
msgstr "Impussibil lei il DVD."
-msgid ""
-"Failed to configure LAME mp3 audio encoder. Check your encoding parameters."
-msgstr ""
-"No si è rivâts a configurâ il codificadôr audio mp3 LAME. Controle i "
-"parametris di codifiche."
-
-#, c-format
-msgid ""
-"The requested bitrate %d kbit/s for property '%s' is not allowed. The "
-"bitrate was changed to %d kbit/s."
-msgstr ""
-"Il bitrate domandât (%d kbit/s) pe proprietât '%s' nol è permetût. Il "
-"bitrate al è stât cambiât a %d kbit/s."
-
-msgid "Failed to configure TwoLAME encoder. Check your encoding parameters."
-msgstr ""
-"No si è rivâts a configurâ il codificadôr TwoLAME. Controle i parametris di "
-"codifiche."
-
msgid "This stream contains no data."
msgstr "Il flus nol conten dâts."
+
+#~ msgid ""
+#~ "Failed to configure LAME mp3 audio encoder. Check your encoding "
+#~ "parameters."
+#~ msgstr ""
+#~ "No si è rivâts a configurâ il codificadôr audio mp3 LAME. Controle i "
+#~ "parametris di codifiche."
+
+#~ msgid ""
+#~ "The requested bitrate %d kbit/s for property '%s' is not allowed. The "
+#~ "bitrate was changed to %d kbit/s."
+#~ msgstr ""
+#~ "Il bitrate domandât (%d kbit/s) pe proprietât '%s' nol è permetût. Il "
+#~ "bitrate al è stât cambiât a %d kbit/s."
+
+#~ msgid "Failed to configure TwoLAME encoder. Check your encoding parameters."
+#~ msgstr ""
+#~ "No si è rivâts a configurâ il codificadôr TwoLAME. Controle i parametris "
+#~ "di codifiche."
diff --git a/po/gl.gmo b/po/gl.gmo
index bee97c9..b337b08 100644
--- a/po/gl.gmo
+++ b/po/gl.gmo
Binary files differ
diff --git a/po/gl.po b/po/gl.po
index 2a965a5..e285476 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: gst-plugins-ugly 1.0.3\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n"
-"POT-Creation-Date: 2017-12-07 19:26+0200\n"
+"POT-Creation-Date: 2018-02-15 17:10+0000\n"
"PO-Revision-Date: 2012-12-15 03:47+0200\n"
"Last-Translator: Fran Dieguez <frandieguez@ubuntu.com>\n"
"Language-Team: Galician <proxecto@trasno.net>\n"
@@ -58,27 +58,27 @@
msgid "Could not read DVD."
msgstr "Non foi posíbel ler o DVD"
-msgid ""
-"Failed to configure LAME mp3 audio encoder. Check your encoding parameters."
-msgstr ""
-"Produciuse un erro ao configurar o codificador LAME mp3. Comprobe os seus "
-"parámetros de codificación."
-
-#, c-format
-msgid ""
-"The requested bitrate %d kbit/s for property '%s' is not allowed. The "
-"bitrate was changed to %d kbit/s."
-msgstr ""
-"Non se permite o bitrate solicitado %d kbit/s para a propiedade '%s'. O "
-"bitrate cambiouse a %d kbit/s."
-
-msgid "Failed to configure TwoLAME encoder. Check your encoding parameters."
-msgstr ""
-"Produciuse un fallo ao configurar o codificador TwoLAME. Comprobe os seus "
-"parámetros de codificación."
-
msgid "This stream contains no data."
msgstr "Este fluxo non contén datos."
+#~ msgid ""
+#~ "Failed to configure LAME mp3 audio encoder. Check your encoding "
+#~ "parameters."
+#~ msgstr ""
+#~ "Produciuse un erro ao configurar o codificador LAME mp3. Comprobe os seus "
+#~ "parámetros de codificación."
+
+#~ msgid ""
+#~ "The requested bitrate %d kbit/s for property '%s' is not allowed. The "
+#~ "bitrate was changed to %d kbit/s."
+#~ msgstr ""
+#~ "Non se permite o bitrate solicitado %d kbit/s para a propiedade '%s'. O "
+#~ "bitrate cambiouse a %d kbit/s."
+
+#~ msgid "Failed to configure TwoLAME encoder. Check your encoding parameters."
+#~ msgstr ""
+#~ "Produciuse un fallo ao configurar o codificador TwoLAME. Comprobe os seus "
+#~ "parámetros de codificación."
+
#~ msgid "Internal data stream error."
#~ msgstr "Erro de fluxo de datos interno."
diff --git a/po/gst-plugins-ugly-1.0.pot b/po/gst-plugins-ugly-1.0.pot
index 6318888..bba10f9 100644
--- a/po/gst-plugins-ugly-1.0.pot
+++ b/po/gst-plugins-ugly-1.0.pot
@@ -5,9 +5,9 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: gst-plugins-ugly 1.12.4\n"
+"Project-Id-Version: gst-plugins-ugly 1.13.1\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n"
-"POT-Creation-Date: 2017-12-07 19:26+0200\n"
+"POT-Creation-Date: 2018-02-15 17:10+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -60,22 +60,6 @@
msgid "Could not read DVD."
msgstr ""
-#: ext/lame/gstlamemp3enc.c:395
-msgid ""
-"Failed to configure LAME mp3 audio encoder. Check your encoding parameters."
-msgstr ""
-
-#: ext/lame/gstlamemp3enc.c:427 ext/twolame/gsttwolamemp2enc.c:488
-#, c-format
-msgid ""
-"The requested bitrate %d kbit/s for property '%s' is not allowed. The "
-"bitrate was changed to %d kbit/s."
-msgstr ""
-
-#: ext/twolame/gsttwolamemp2enc.c:411
-msgid "Failed to configure TwoLAME encoder. Check your encoding parameters."
-msgstr ""
-
#: gst/asfdemux/gstasfdemux.c:446 gst/asfdemux/gstasfdemux.c:454
msgid "This stream contains no data."
msgstr ""
diff --git a/po/hr.gmo b/po/hr.gmo
index 890e83f..51fa4a5 100644
--- a/po/hr.gmo
+++ b/po/hr.gmo
Binary files differ
diff --git a/po/hr.po b/po/hr.po
index 349eee7..75afa74 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: gst-plugins-ugly-1.10.0\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n"
-"POT-Creation-Date: 2017-12-07 19:26+0200\n"
+"POT-Creation-Date: 2018-02-15 17:10+0000\n"
"PO-Revision-Date: 2016-11-19 10:23-0800\n"
"Last-Translator: Božidar Putanec <bozidarp@yahoo.com>\n"
"Language-Team: Croatian <lokalizacija@linux.hr>\n"
@@ -58,26 +58,26 @@
msgid "Could not read DVD."
msgstr "DVD nije moguće čitati."
-msgid ""
-"Failed to configure LAME mp3 audio encoder. Check your encoding parameters."
-msgstr ""
-"Konfiguracija LAME mp3 audiokodera nije uspjela. Provjerite parametre "
-"kodiranja."
-
-#, c-format
-msgid ""
-"The requested bitrate %d kbit/s for property '%s' is not allowed. The "
-"bitrate was changed to %d kbit/s."
-msgstr ""
-"Tražena brzina (bitrate) %d kbit/s za svojstvo ‘%s’ nije dopuštena. Brzina "
-"(bitrate) je promijenjena u %d kbit/s."
-
-msgid "Failed to configure TwoLAME encoder. Check your encoding parameters."
-msgstr ""
-"Konfiguracija TwoLAME kodera nije uspjela. Provjerite parametre kodiranja."
-
msgid "This stream contains no data."
msgstr "Ovaj stream (tok podataka) ne sadrži podatke."
+#~ msgid ""
+#~ "Failed to configure LAME mp3 audio encoder. Check your encoding "
+#~ "parameters."
+#~ msgstr ""
+#~ "Konfiguracija LAME mp3 audiokodera nije uspjela. Provjerite parametre "
+#~ "kodiranja."
+
+#~ msgid ""
+#~ "The requested bitrate %d kbit/s for property '%s' is not allowed. The "
+#~ "bitrate was changed to %d kbit/s."
+#~ msgstr ""
+#~ "Tražena brzina (bitrate) %d kbit/s za svojstvo ‘%s’ nije dopuštena. "
+#~ "Brzina (bitrate) je promijenjena u %d kbit/s."
+
+#~ msgid "Failed to configure TwoLAME encoder. Check your encoding parameters."
+#~ msgstr ""
+#~ "Konfiguracija TwoLAME kodera nije uspjela. Provjerite parametre kodiranja."
+
#~ msgid "Internal data stream error."
#~ msgstr "Interna greška toka (stream) podataka."
diff --git a/po/hu.gmo b/po/hu.gmo
index 60f3fe4..5991777 100644
--- a/po/hu.gmo
+++ b/po/hu.gmo
Binary files differ
diff --git a/po/hu.po b/po/hu.po
index 3390d50..28f8932 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: gst-plugins-ugly 1.0.3\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n"
-"POT-Creation-Date: 2017-12-07 19:26+0200\n"
+"POT-Creation-Date: 2018-02-15 17:10+0000\n"
"PO-Revision-Date: 2012-11-30 15:02+0100\n"
"Last-Translator: Gabor Kelemen <kelemeng@gnome.hu>\n"
"Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
@@ -56,27 +56,28 @@
msgid "Could not read DVD."
msgstr "Nem olvasható a DVD."
-msgid ""
-"Failed to configure LAME mp3 audio encoder. Check your encoding parameters."
-msgstr ""
-"A LAME MP3 hangkódoló beállítása meghiúsult. Ellenőrizze a kódolás "
-"beállításait."
-
-#, c-format
-msgid ""
-"The requested bitrate %d kbit/s for property '%s' is not allowed. The "
-"bitrate was changed to %d kbit/s."
-msgstr ""
-"A kért %d kbit/s bitsebesség nem engedélyezett a(z) „%s” tulajdonsághoz. A "
-"bitsebesség módosítva %d kbit/s-re."
-
-msgid "Failed to configure TwoLAME encoder. Check your encoding parameters."
-msgstr ""
-"A TwoLAME kódoló beállítása meghiúsult. Ellenőrizze a kódolás beállításait."
-
msgid "This stream contains no data."
msgstr "Ez az adatfolyam nem tartalmaz adatokat."
+#~ msgid ""
+#~ "Failed to configure LAME mp3 audio encoder. Check your encoding "
+#~ "parameters."
+#~ msgstr ""
+#~ "A LAME MP3 hangkódoló beállítása meghiúsult. Ellenőrizze a kódolás "
+#~ "beállításait."
+
+#~ msgid ""
+#~ "The requested bitrate %d kbit/s for property '%s' is not allowed. The "
+#~ "bitrate was changed to %d kbit/s."
+#~ msgstr ""
+#~ "A kért %d kbit/s bitsebesség nem engedélyezett a(z) „%s” tulajdonsághoz. "
+#~ "A bitsebesség módosítva %d kbit/s-re."
+
+#~ msgid "Failed to configure TwoLAME encoder. Check your encoding parameters."
+#~ msgstr ""
+#~ "A TwoLAME kódoló beállítása meghiúsult. Ellenőrizze a kódolás "
+#~ "beállításait."
+
#~ msgid "Internal data stream error."
#~ msgstr "Belső adatfolyam-hiba."
diff --git a/po/id.gmo b/po/id.gmo
index 6f48f72..f311a09 100644
--- a/po/id.gmo
+++ b/po/id.gmo
Binary files differ
diff --git a/po/id.po b/po/id.po
index 670c2f4..d9c80a1 100644
--- a/po/id.po
+++ b/po/id.po
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: gst-plugins-ugly 1.2.1\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n"
-"POT-Creation-Date: 2017-12-07 19:26+0200\n"
+"POT-Creation-Date: 2018-02-15 17:10+0000\n"
"PO-Revision-Date: 2014-01-27 20:04+0700\n"
"Last-Translator: Andhika Padmawan <andhika.padmawan@gmail.com>\n"
"Language-Team: Indonesian <translation-team-id@lists.sourceforge.net>\n"
@@ -54,24 +54,25 @@
msgid "Could not read DVD."
msgstr "Tak dapat membaca DVD."
-msgid ""
-"Failed to configure LAME mp3 audio encoder. Check your encoding parameters."
-msgstr "Gagal mengatur penyandi audio mp3 LAME. Cek parameter penyandian anda."
-
-#, c-format
-msgid ""
-"The requested bitrate %d kbit/s for property '%s' is not allowed. The "
-"bitrate was changed to %d kbit/s."
-msgstr ""
-"Bitrasi %d kbit/s yang diminta untuk properti '%s' tidak diizinkan. Bitrasi "
-"diubah ke %d kbit/s."
-
-msgid "Failed to configure TwoLAME encoder. Check your encoding parameters."
-msgstr "Gagal mengatur penyandi TwoLAME. Cek parameter penyandian anda."
-
msgid "This stream contains no data."
msgstr "Arus ini tidak berisi data."
+#~ msgid ""
+#~ "Failed to configure LAME mp3 audio encoder. Check your encoding "
+#~ "parameters."
+#~ msgstr ""
+#~ "Gagal mengatur penyandi audio mp3 LAME. Cek parameter penyandian anda."
+
+#~ msgid ""
+#~ "The requested bitrate %d kbit/s for property '%s' is not allowed. The "
+#~ "bitrate was changed to %d kbit/s."
+#~ msgstr ""
+#~ "Bitrasi %d kbit/s yang diminta untuk properti '%s' tidak diizinkan. "
+#~ "Bitrasi diubah ke %d kbit/s."
+
+#~ msgid "Failed to configure TwoLAME encoder. Check your encoding parameters."
+#~ msgstr "Gagal mengatur penyandi TwoLAME. Cek parameter penyandian anda."
+
#~ msgid "Internal data stream error."
#~ msgstr "Galat arus data internal."
diff --git a/po/it.gmo b/po/it.gmo
index 85b68b0..1152d29 100644
--- a/po/it.gmo
+++ b/po/it.gmo
Binary files differ
diff --git a/po/it.po b/po/it.po
index aac44c4..1b14045 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: gst-plugins-ugly 1.10.0\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n"
-"POT-Creation-Date: 2017-12-07 19:26+0200\n"
+"POT-Creation-Date: 2018-02-15 17:10+0000\n"
"PO-Revision-Date: 2017-09-15 09:56+0200\n"
"Last-Translator: Sebastiano Pistore <sebastianopistore.info@protonmail.ch>\n"
"Language-Team: Italian <tp@lists.linux.it>\n"
@@ -58,30 +58,30 @@
msgid "Could not read DVD."
msgstr "Impossibile leggere il DVD."
-msgid ""
-"Failed to configure LAME mp3 audio encoder. Check your encoding parameters."
-msgstr ""
-"Configurazione dell'encoder LAME mp3 non riuscita. Verificare i parametri di "
-"codifica."
-
-# NEW
-#, c-format
-msgid ""
-"The requested bitrate %d kbit/s for property '%s' is not allowed. The "
-"bitrate was changed to %d kbit/s."
-msgstr ""
-"Il bitrate richiesto di %d kbit/s per la proprietà «%s» non è consentito. Il "
-"bitrate è stato cambiato a %d kbit/s."
-
-msgid "Failed to configure TwoLAME encoder. Check your encoding parameters."
-msgstr ""
-"Configurazione dell'encoder TwoLAME non riuscita. Verificare i parametri di "
-"codifica."
-
# NEW
msgid "This stream contains no data."
msgstr "Questo flusso non contiene dati."
+#~ msgid ""
+#~ "Failed to configure LAME mp3 audio encoder. Check your encoding "
+#~ "parameters."
+#~ msgstr ""
+#~ "Configurazione dell'encoder LAME mp3 non riuscita. Verificare i parametri "
+#~ "di codifica."
+
+# NEW
+#~ msgid ""
+#~ "The requested bitrate %d kbit/s for property '%s' is not allowed. The "
+#~ "bitrate was changed to %d kbit/s."
+#~ msgstr ""
+#~ "Il bitrate richiesto di %d kbit/s per la proprietà «%s» non è consentito. "
+#~ "Il bitrate è stato cambiato a %d kbit/s."
+
+#~ msgid "Failed to configure TwoLAME encoder. Check your encoding parameters."
+#~ msgstr ""
+#~ "Configurazione dell'encoder TwoLAME non riuscita. Verificare i parametri "
+#~ "di codifica."
+
#~ msgid "Invalid title information on DVD."
#~ msgstr "Informazioni del titolo non valide sul DVD."
diff --git a/po/ja.gmo b/po/ja.gmo
index 8adc3a3..04e7870 100644
--- a/po/ja.gmo
+++ b/po/ja.gmo
Binary files differ
diff --git a/po/ja.po b/po/ja.po
index e7e09b2..d9c5bc4 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: gst-plugins-ugly 1.0.3\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n"
-"POT-Creation-Date: 2017-12-07 19:26+0200\n"
+"POT-Creation-Date: 2018-02-15 17:10+0000\n"
"PO-Revision-Date: 2012-12-22 19:42+0900\n"
"Last-Translator: Takeshi Hamasaki <hmatrjp@users.sourceforge.jp>\n"
"Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"
@@ -56,28 +56,28 @@
msgid "Could not read DVD."
msgstr "DVDを読み込むことができません。"
-msgid ""
-"Failed to configure LAME mp3 audio encoder. Check your encoding parameters."
-msgstr ""
-"LAME MP3 音声エンコーダーの構成に失敗しました。エンコーディングパラメータを"
-"チェックしてください。"
-
-#, c-format
-msgid ""
-"The requested bitrate %d kbit/s for property '%s' is not allowed. The "
-"bitrate was changed to %d kbit/s."
-msgstr ""
-"要求されたビットレート %d kbit/s はプロパティ '%s' では許可されません。そのた"
-"めビットレートは %d kbit/s へ変更されました。"
-
-msgid "Failed to configure TwoLAME encoder. Check your encoding parameters."
-msgstr ""
-"TwoLAMEエンコーダーの構成に失敗しました。エンコード用のパラメータをチェックし"
-"てください。"
-
msgid "This stream contains no data."
msgstr "このストリームはデータを含んでいません。"
+#~ msgid ""
+#~ "Failed to configure LAME mp3 audio encoder. Check your encoding "
+#~ "parameters."
+#~ msgstr ""
+#~ "LAME MP3 音声エンコーダーの構成に失敗しました。エンコーディングパラメータ"
+#~ "をチェックしてください。"
+
+#~ msgid ""
+#~ "The requested bitrate %d kbit/s for property '%s' is not allowed. The "
+#~ "bitrate was changed to %d kbit/s."
+#~ msgstr ""
+#~ "要求されたビットレート %d kbit/s はプロパティ '%s' では許可されません。そ"
+#~ "のためビットレートは %d kbit/s へ変更されました。"
+
+#~ msgid "Failed to configure TwoLAME encoder. Check your encoding parameters."
+#~ msgstr ""
+#~ "TwoLAMEエンコーダーの構成に失敗しました。エンコード用のパラメータをチェッ"
+#~ "クしてください。"
+
#~ msgid "Internal data stream error."
#~ msgstr "内部データストリームエラー。"
diff --git a/po/lt.gmo b/po/lt.gmo
index 1e194a8..b61f9df 100644
--- a/po/lt.gmo
+++ b/po/lt.gmo
Binary files differ
diff --git a/po/lt.po b/po/lt.po
index 131c280..63efde9 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: gst-plugins-ugly-0.10.7.2\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n"
-"POT-Creation-Date: 2017-12-07 19:26+0200\n"
+"POT-Creation-Date: 2018-02-15 17:10+0000\n"
"PO-Revision-Date: 2008-05-14 02:52+0300\n"
"Last-Translator: Gintautas Miliauskas <gintas@akl.lt>\n"
"Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n"
@@ -56,32 +56,32 @@
msgid "Could not read DVD."
msgstr "Nepavyko atverti DVD"
-#, fuzzy
-msgid ""
-"Failed to configure LAME mp3 audio encoder. Check your encoding parameters."
-msgstr ""
-"Nepavyko sukonfigūruoti LAME kodavimo programos. Patikrinkite kodavimo "
-"parametrus."
-
-#, c-format
-msgid ""
-"The requested bitrate %d kbit/s for property '%s' is not allowed. The "
-"bitrate was changed to %d kbit/s."
-msgstr ""
-"Pageidautas bitų dažnis %d kbit/s savybei „%s“ neleidžiamas. Bitų dažnis "
-"pakeistas į %d kbit/s."
-
-#, fuzzy
-msgid "Failed to configure TwoLAME encoder. Check your encoding parameters."
-msgstr ""
-"Nepavyko sukonfigūruoti LAME kodavimo programos. Patikrinkite kodavimo "
-"parametrus."
-
msgid "This stream contains no data."
msgstr "Šiame sraute nėra duomenų."
#, fuzzy
#~ msgid ""
+#~ "Failed to configure LAME mp3 audio encoder. Check your encoding "
+#~ "parameters."
+#~ msgstr ""
+#~ "Nepavyko sukonfigūruoti LAME kodavimo programos. Patikrinkite kodavimo "
+#~ "parametrus."
+
+#~ msgid ""
+#~ "The requested bitrate %d kbit/s for property '%s' is not allowed. The "
+#~ "bitrate was changed to %d kbit/s."
+#~ msgstr ""
+#~ "Pageidautas bitų dažnis %d kbit/s savybei „%s“ neleidžiamas. Bitų dažnis "
+#~ "pakeistas į %d kbit/s."
+
+#, fuzzy
+#~ msgid "Failed to configure TwoLAME encoder. Check your encoding parameters."
+#~ msgstr ""
+#~ "Nepavyko sukonfigūruoti LAME kodavimo programos. Patikrinkite kodavimo "
+#~ "parametrus."
+
+#, fuzzy
+#~ msgid ""
#~ "Failed to configure LAMEMP3ENC encoder. Check your encoding parameters."
#~ msgstr ""
#~ "Nepavyko sukonfigūruoti LAME kodavimo programos. Patikrinkite kodavimo "
diff --git a/po/lv.gmo b/po/lv.gmo
index 47018a7..c7448d1 100644
--- a/po/lv.gmo
+++ b/po/lv.gmo
Binary files differ
diff --git a/po/lv.po b/po/lv.po
index f5c293f..6d3534d 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: gst-plugins-ugly 1.2.1\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n"
-"POT-Creation-Date: 2017-12-07 19:26+0200\n"
+"POT-Creation-Date: 2018-02-15 17:10+0000\n"
"PO-Revision-Date: 2014-04-20 16:24+0300\n"
"Last-Translator: Rihards Prieditis <rprieditis@gmail.com>\n"
"Language-Team: Latvian <translation-team-lv@lists.sourceforge.net>\n"
@@ -57,27 +57,28 @@
msgid "Could not read DVD."
msgstr "Nevarēja nolasīt DVD."
-msgid ""
-"Failed to configure LAME mp3 audio encoder. Check your encoding parameters."
-msgstr ""
-"Neizdevās konfigurēt LAME mp3 audio kodētāju. Pārbaudiet savus kodēšanas "
-"parametrus."
-
-#, c-format
-msgid ""
-"The requested bitrate %d kbit/s for property '%s' is not allowed. The "
-"bitrate was changed to %d kbit/s."
-msgstr ""
-"Pieprasītais straumēšanas ātrums %d kbiti/s nepieciešamajai īpašībai “%s” "
-"nav atļauts. Straumēšanas ātrums tika mainīts uz %d kbitiem/s."
-
-msgid "Failed to configure TwoLAME encoder. Check your encoding parameters."
-msgstr ""
-"Neizdevās konfigurēt TwoLAME kodētāju. Pārbaudiet savus kodēšanas parametrus."
-
msgid "This stream contains no data."
msgstr "Šī straume nesatur datus."
+#~ msgid ""
+#~ "Failed to configure LAME mp3 audio encoder. Check your encoding "
+#~ "parameters."
+#~ msgstr ""
+#~ "Neizdevās konfigurēt LAME mp3 audio kodētāju. Pārbaudiet savus kodēšanas "
+#~ "parametrus."
+
+#~ msgid ""
+#~ "The requested bitrate %d kbit/s for property '%s' is not allowed. The "
+#~ "bitrate was changed to %d kbit/s."
+#~ msgstr ""
+#~ "Pieprasītais straumēšanas ātrums %d kbiti/s nepieciešamajai īpašībai “%s” "
+#~ "nav atļauts. Straumēšanas ātrums tika mainīts uz %d kbitiem/s."
+
+#~ msgid "Failed to configure TwoLAME encoder. Check your encoding parameters."
+#~ msgstr ""
+#~ "Neizdevās konfigurēt TwoLAME kodētāju. Pārbaudiet savus kodēšanas "
+#~ "parametrus."
+
#~ msgid "Internal data stream error."
#~ msgstr "Iekšēja datu plūsmas kļūda."
diff --git a/po/meson.build b/po/meson.build
index 0644277..2657c01 100644
--- a/po/meson.build
+++ b/po/meson.build
@@ -1,9 +1,3 @@
i18n = import('i18n')
-langs = [ 'af', 'az', 'bg', 'ca', 'cs', 'da', 'de', 'el',
- 'en_GB', 'eo', 'es', 'eu', 'fi', 'fr', 'gl', 'hr',
- 'hu', 'id', 'it', 'ja', 'lt', 'lv', 'ms', 'mt',
- 'nb', 'nl', 'or', 'pl', 'pt_BR', 'ro', 'ru', 'sk', 'sl',
- 'sq', 'sr', 'sv', 'tr', 'uk', 'vi', 'zh_CN' ]
-
-i18n.gettext('gst-plugins-ugly-1.0', languages : langs)
+i18n.gettext('gst-plugins-ugly-1.0', preset: 'glib')
diff --git a/po/ms.gmo b/po/ms.gmo
index 5236720..850ea88 100644
--- a/po/ms.gmo
+++ b/po/ms.gmo
Binary files differ
diff --git a/po/ms.po b/po/ms.po
index e49e095..372c117 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: gst-plugins-ugly-0.10.11.2\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n"
-"POT-Creation-Date: 2017-12-07 19:26+0200\n"
+"POT-Creation-Date: 2018-02-15 17:10+0000\n"
"PO-Revision-Date: 2009-07-16 15:07+0800\n"
"Last-Translator: Muhammad Najmi bin Ahmad Zabidi <najmi.zabidi@gmail.com>\n"
"Language-Team: Malay <translation-team-ms@lists.sourceforge.net>\n"
@@ -52,27 +52,27 @@
msgid "Could not read DVD."
msgstr "Tidak dapat buka DVD"
-#, fuzzy
-msgid ""
-"Failed to configure LAME mp3 audio encoder. Check your encoding parameters."
-msgstr ""
-"Gagal mengkonfigur pengenkod TwoLAME. Periksa parameter pengenkod anda."
-
-#, c-format
-msgid ""
-"The requested bitrate %d kbit/s for property '%s' is not allowed. The "
-"bitrate was changed to %d kbit/s."
-msgstr ""
-"Kadarbit %d yang diminta untuk properti '%s' tidak dibenarkan. Kadarbit "
-"telah ditukar ke %d kbit/s."
-
-msgid "Failed to configure TwoLAME encoder. Check your encoding parameters."
-msgstr ""
-"Gagal mengkonfigur pengenkod TwoLAME. Periksa parameter pengenkod anda."
-
msgid "This stream contains no data."
msgstr "Aliran ini tiada data."
+#, fuzzy
+#~ msgid ""
+#~ "Failed to configure LAME mp3 audio encoder. Check your encoding "
+#~ "parameters."
+#~ msgstr ""
+#~ "Gagal mengkonfigur pengenkod TwoLAME. Periksa parameter pengenkod anda."
+
+#~ msgid ""
+#~ "The requested bitrate %d kbit/s for property '%s' is not allowed. The "
+#~ "bitrate was changed to %d kbit/s."
+#~ msgstr ""
+#~ "Kadarbit %d yang diminta untuk properti '%s' tidak dibenarkan. Kadarbit "
+#~ "telah ditukar ke %d kbit/s."
+
+#~ msgid "Failed to configure TwoLAME encoder. Check your encoding parameters."
+#~ msgstr ""
+#~ "Gagal mengkonfigur pengenkod TwoLAME. Periksa parameter pengenkod anda."
+
#~ msgid "Internal data stream error."
#~ msgstr "Ralat aliran data dalaman."
diff --git a/po/mt.gmo b/po/mt.gmo
index d6f99fb..93c0110 100644
--- a/po/mt.gmo
+++ b/po/mt.gmo
Binary files differ
diff --git a/po/mt.po b/po/mt.po
index 4ab43a0..b82fadf 100644
--- a/po/mt.po
+++ b/po/mt.po
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: gst-plugins-ugly-0.10.9.3\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n"
-"POT-Creation-Date: 2017-12-07 19:26+0200\n"
+"POT-Creation-Date: 2018-02-15 17:10+0000\n"
"PO-Revision-Date: 2008-11-13 18:18+0100\n"
"Last-Translator: Michel Bugeja <michelbugeja@rabatmalta.com>\n"
"Language-Team: Maltese <translation-team-mt@lists.sourceforge.net>\n"
@@ -55,28 +55,28 @@
msgid "Could not read DVD."
msgstr "Ma nistax niftaħ DVD."
-#, fuzzy
-msgid ""
-"Failed to configure LAME mp3 audio encoder. Check your encoding parameters."
-msgstr ""
-"Problema biex nissetja LAME encoder. Iċċekkja l-parametri tal-encoding."
-
-#, c-format
-msgid ""
-"The requested bitrate %d kbit/s for property '%s' is not allowed. The "
-"bitrate was changed to %d kbit/s."
-msgstr ""
-"Mhux permess il-bitrate %d kbit/s rikjesta għal '%s'. Għalhekk il-bitrate "
-"ġiet mibdula għal %d kbit/s."
-
-#, fuzzy
-msgid "Failed to configure TwoLAME encoder. Check your encoding parameters."
-msgstr ""
-"Problema biex nissetja LAME encoder. Iċċekkja l-parametri tal-encoding."
-
msgid "This stream contains no data."
msgstr "L-istream ma fiha l-ebda data."
+#, fuzzy
+#~ msgid ""
+#~ "Failed to configure LAME mp3 audio encoder. Check your encoding "
+#~ "parameters."
+#~ msgstr ""
+#~ "Problema biex nissetja LAME encoder. Iċċekkja l-parametri tal-encoding."
+
+#~ msgid ""
+#~ "The requested bitrate %d kbit/s for property '%s' is not allowed. The "
+#~ "bitrate was changed to %d kbit/s."
+#~ msgstr ""
+#~ "Mhux permess il-bitrate %d kbit/s rikjesta għal '%s'. Għalhekk il-bitrate "
+#~ "ġiet mibdula għal %d kbit/s."
+
+#, fuzzy
+#~ msgid "Failed to configure TwoLAME encoder. Check your encoding parameters."
+#~ msgstr ""
+#~ "Problema biex nissetja LAME encoder. Iċċekkja l-parametri tal-encoding."
+
#~ msgid "Internal data stream error."
#~ msgstr "Problema interna fid-data stream."
diff --git a/po/nb.gmo b/po/nb.gmo
index 962b3a6..5c7f60a 100644
--- a/po/nb.gmo
+++ b/po/nb.gmo
Binary files differ
diff --git a/po/nb.po b/po/nb.po
index 2df03e1..4249202 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: gst-plugins-ugly 1.0.3\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n"
-"POT-Creation-Date: 2017-12-07 19:26+0200\n"
+"POT-Creation-Date: 2018-02-15 17:10+0000\n"
"PO-Revision-Date: 2012-12-21 21:38+0100\n"
"Last-Translator: Johnny A. Solbu <johnny@solbu.net>\n"
"Language-Team: Norwegian Bokmaal <i18n-nb@lister.ping.uio.no>\n"
@@ -56,25 +56,25 @@
msgid "Could not read DVD."
msgstr "Kunne ikke lese DVD"
-msgid ""
-"Failed to configure LAME mp3 audio encoder. Check your encoding parameters."
-msgstr "Kunne ikke konfigurere LAME-koder. Sjekk parametere for kodingen."
-
-#, c-format
-msgid ""
-"The requested bitrate %d kbit/s for property '%s' is not allowed. The "
-"bitrate was changed to %d kbit/s."
-msgstr ""
-"Forespurt bitrate %d kbit/s for egenskap «%s» er ikke tillatt. Bitraten ble "
-"endret til %d kbit/s."
-
-msgid "Failed to configure TwoLAME encoder. Check your encoding parameters."
-msgstr ""
-"Kunne ikke konfigurere TwoLAME-enkoder. Sjekk parameterene for kodingen."
-
msgid "This stream contains no data."
msgstr "Denne strømmen inneholde ikke data."
+#~ msgid ""
+#~ "Failed to configure LAME mp3 audio encoder. Check your encoding "
+#~ "parameters."
+#~ msgstr "Kunne ikke konfigurere LAME-koder. Sjekk parametere for kodingen."
+
+#~ msgid ""
+#~ "The requested bitrate %d kbit/s for property '%s' is not allowed. The "
+#~ "bitrate was changed to %d kbit/s."
+#~ msgstr ""
+#~ "Forespurt bitrate %d kbit/s for egenskap «%s» er ikke tillatt. Bitraten "
+#~ "ble endret til %d kbit/s."
+
+#~ msgid "Failed to configure TwoLAME encoder. Check your encoding parameters."
+#~ msgstr ""
+#~ "Kunne ikke konfigurere TwoLAME-enkoder. Sjekk parameterene for kodingen."
+
#~ msgid "Internal data stream error."
#~ msgstr "Intern feil i datastrøm."
diff --git a/po/nl.gmo b/po/nl.gmo
index 4cd8d84..c2f8b3a 100644
--- a/po/nl.gmo
+++ b/po/nl.gmo
Binary files differ
diff --git a/po/nl.po b/po/nl.po
index 91a8932..3c2d443 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: gst-plugins-ugly 1.10.0\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n"
-"POT-Creation-Date: 2017-12-07 19:26+0200\n"
+"POT-Creation-Date: 2018-02-15 17:10+0000\n"
"PO-Revision-Date: 2017-10-24 23:30+0100\n"
"Last-Translator: Freek de Kruijf <f.de.kruijf@gmail.com>\n"
"Language-Team: Dutch <vertaling@vrijschrift.org>\n"
@@ -57,27 +57,28 @@
msgid "Could not read DVD."
msgstr "Kon dvd niet lezen"
-msgid ""
-"Failed to configure LAME mp3 audio encoder. Check your encoding parameters."
-msgstr ""
-"Instellen van de LAME mp3-encoder is mislukt. Controleer uw parameters voor "
-"codering."
-
-#, c-format
-msgid ""
-"The requested bitrate %d kbit/s for property '%s' is not allowed. The "
-"bitrate was changed to %d kbit/s."
-msgstr ""
-"De gevraagde bitsnelheid %d kbits/s voor eigenschap '%s' is niet toegestaan. "
-"De bitsnelheid is gewijzigd in %d kbits/s."
-
-msgid "Failed to configure TwoLAME encoder. Check your encoding parameters."
-msgstr ""
-"Kan de TwoLAME-encoder niet configureren. Controleer uw encodingparameters."
-
msgid "This stream contains no data."
msgstr "Deze stroom bevat geen gegevens."
+#~ msgid ""
+#~ "Failed to configure LAME mp3 audio encoder. Check your encoding "
+#~ "parameters."
+#~ msgstr ""
+#~ "Instellen van de LAME mp3-encoder is mislukt. Controleer uw parameters "
+#~ "voor codering."
+
+#~ msgid ""
+#~ "The requested bitrate %d kbit/s for property '%s' is not allowed. The "
+#~ "bitrate was changed to %d kbit/s."
+#~ msgstr ""
+#~ "De gevraagde bitsnelheid %d kbits/s voor eigenschap '%s' is niet "
+#~ "toegestaan. De bitsnelheid is gewijzigd in %d kbits/s."
+
+#~ msgid "Failed to configure TwoLAME encoder. Check your encoding parameters."
+#~ msgstr ""
+#~ "Kan de TwoLAME-encoder niet configureren. Controleer uw "
+#~ "encodingparameters."
+
#~ msgid "Internal data stream error."
#~ msgstr "Fout met interne gegevensstroom."
diff --git a/po/or.po b/po/or.po
index 22e4b93..c38ff18 100644
--- a/po/or.po
+++ b/po/or.po
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: gst-plugins-0.8.3\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n"
-"POT-Creation-Date: 2017-12-07 19:26+0200\n"
+"POT-Creation-Date: 2018-02-15 17:10+0000\n"
"PO-Revision-Date: 2004-09-27 13:32+0530\n"
"Last-Translator: Gora Mohanty <gora_mohanty@yahoo.co.in>\n"
"Language-Team: Oriya <gora_mohanty@yahoo.co.in>\n"
@@ -54,19 +54,6 @@
msgid "Could not read DVD."
msgstr "\"%s\" ଫାଇଲ ଲେଖିହେଲା ନାହିଁ."
-msgid ""
-"Failed to configure LAME mp3 audio encoder. Check your encoding parameters."
-msgstr ""
-
-#, c-format
-msgid ""
-"The requested bitrate %d kbit/s for property '%s' is not allowed. The "
-"bitrate was changed to %d kbit/s."
-msgstr ""
-
-msgid "Failed to configure TwoLAME encoder. Check your encoding parameters."
-msgstr ""
-
msgid "This stream contains no data."
msgstr ""
diff --git a/po/pl.gmo b/po/pl.gmo
index 36d5ad5..ef376db 100644
--- a/po/pl.gmo
+++ b/po/pl.gmo
Binary files differ
diff --git a/po/pl.po b/po/pl.po
index 78a3f80..c1661a0 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: gst-plugins-ugly 1.0.3\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n"
-"POT-Creation-Date: 2017-12-07 19:26+0200\n"
+"POT-Creation-Date: 2018-02-15 17:10+0000\n"
"PO-Revision-Date: 2012-11-28 19:34+0100\n"
"Last-Translator: Jakub Bogusz <qboosh@pld-linux.org>\n"
"Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
@@ -53,27 +53,27 @@
msgid "Could not read DVD."
msgstr "Nie udało się odczytać DVD."
-msgid ""
-"Failed to configure LAME mp3 audio encoder. Check your encoding parameters."
-msgstr ""
-"Nie udało się skonfigurować kodera dźwięku mp3 LAME. Proszę sprawdzić "
-"parametry kodowania."
-
-#, c-format
-msgid ""
-"The requested bitrate %d kbit/s for property '%s' is not allowed. The "
-"bitrate was changed to %d kbit/s."
-msgstr ""
-"Żądana prędkość bitowa %d kbit/s dla właściwości '%s' nie jest dozwolona. "
-"Prędkość bitowa zmieniona na %d kbit/s."
-
-msgid "Failed to configure TwoLAME encoder. Check your encoding parameters."
-msgstr ""
-"Nie udało się skonfigurować kodera TwoLAME. Proszę sprawdzić parametry "
-"kodowania."
-
msgid "This stream contains no data."
msgstr "Ten strumień nie zawiera danych."
+#~ msgid ""
+#~ "Failed to configure LAME mp3 audio encoder. Check your encoding "
+#~ "parameters."
+#~ msgstr ""
+#~ "Nie udało się skonfigurować kodera dźwięku mp3 LAME. Proszę sprawdzić "
+#~ "parametry kodowania."
+
+#~ msgid ""
+#~ "The requested bitrate %d kbit/s for property '%s' is not allowed. The "
+#~ "bitrate was changed to %d kbit/s."
+#~ msgstr ""
+#~ "Żądana prędkość bitowa %d kbit/s dla właściwości '%s' nie jest dozwolona. "
+#~ "Prędkość bitowa zmieniona na %d kbit/s."
+
+#~ msgid "Failed to configure TwoLAME encoder. Check your encoding parameters."
+#~ msgstr ""
+#~ "Nie udało się skonfigurować kodera TwoLAME. Proszę sprawdzić parametry "
+#~ "kodowania."
+
#~ msgid "Internal data stream error."
#~ msgstr "Błąd wewnętrzny strumienia danych."
diff --git a/po/pt_BR.gmo b/po/pt_BR.gmo
index b0bc3bc..ab70e4d 100644
--- a/po/pt_BR.gmo
+++ b/po/pt_BR.gmo
Binary files differ
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 00b6e00..8a930be 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: gst-plugins-ugly-1.7.1\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n"
-"POT-Creation-Date: 2017-12-07 19:26+0200\n"
+"POT-Creation-Date: 2018-02-15 17:10+0000\n"
"PO-Revision-Date: 2015-12-28 19:54-0200\n"
"Last-Translator: Fabrício Godoy <skarllot@gmail.com>\n"
"Language-Team: Brazilian Portuguese <ldpbr-translation@lists.sourceforge."
@@ -57,28 +57,28 @@
msgid "Could not read DVD."
msgstr "Não foi possível ler o DVD."
-msgid ""
-"Failed to configure LAME mp3 audio encoder. Check your encoding parameters."
-msgstr ""
-"Falha ao configurar o codificador de áudio MP3 LAME. Verifique seus "
-"parâmetros de codificação."
-
-#, c-format
-msgid ""
-"The requested bitrate %d kbit/s for property '%s' is not allowed. The "
-"bitrate was changed to %d kbit/s."
-msgstr ""
-"A taxa de bits, %d kbits/s, requisitada pela propriedade \"%s\" não é "
-"permitida. A taxa de bits foi alterada para %d kbits/s."
-
-msgid "Failed to configure TwoLAME encoder. Check your encoding parameters."
-msgstr ""
-"Falha ao configurar o codificador TwoLAME. Verifique seus parâmetros de "
-"codificação."
-
msgid "This stream contains no data."
msgstr "Este fluxo não contém dados."
+#~ msgid ""
+#~ "Failed to configure LAME mp3 audio encoder. Check your encoding "
+#~ "parameters."
+#~ msgstr ""
+#~ "Falha ao configurar o codificador de áudio MP3 LAME. Verifique seus "
+#~ "parâmetros de codificação."
+
+#~ msgid ""
+#~ "The requested bitrate %d kbit/s for property '%s' is not allowed. The "
+#~ "bitrate was changed to %d kbit/s."
+#~ msgstr ""
+#~ "A taxa de bits, %d kbits/s, requisitada pela propriedade \"%s\" não é "
+#~ "permitida. A taxa de bits foi alterada para %d kbits/s."
+
+#~ msgid "Failed to configure TwoLAME encoder. Check your encoding parameters."
+#~ msgstr ""
+#~ "Falha ao configurar o codificador TwoLAME. Verifique seus parâmetros de "
+#~ "codificação."
+
#~ msgid "Internal data stream error."
#~ msgstr "Erro interno no fluxo de dados."
diff --git a/po/ro.gmo b/po/ro.gmo
index 3790302..669a703 100644
--- a/po/ro.gmo
+++ b/po/ro.gmo
Binary files differ
diff --git a/po/ro.po b/po/ro.po
index f56ff95..f5daf77 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: gst-plugins-ugly 0.10.14.2\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n"
-"POT-Creation-Date: 2017-12-07 19:26+0200\n"
+"POT-Creation-Date: 2018-02-15 17:10+0000\n"
"PO-Revision-Date: 2010-08-16 03:32+0300\n"
"Last-Translator: Lucian Adrian Grijincu <lucian.grijincu@gmail.com>\n"
"Language-Team: Romanian <translation-team-ro@lists.sourceforge.net>\n"
@@ -54,27 +54,27 @@
msgid "Could not read DVD."
msgstr "Nu s-a putut deschide DVD"
-#, fuzzy
-msgid ""
-"Failed to configure LAME mp3 audio encoder. Check your encoding parameters."
-msgstr ""
-"Nu s-a putut configura codorul TwoLAME. Verificați parametrii de codare."
-
-#, c-format
-msgid ""
-"The requested bitrate %d kbit/s for property '%s' is not allowed. The "
-"bitrate was changed to %d kbit/s."
-msgstr ""
-"Rata de biți solicitată de %d kbiți/s pentru proprietatea „%s” nu este "
-"permisă. Rata de biți a fost modificată la %d kbiți/s."
-
-msgid "Failed to configure TwoLAME encoder. Check your encoding parameters."
-msgstr ""
-"Nu s-a putut configura codorul TwoLAME. Verificați parametrii de codare."
-
msgid "This stream contains no data."
msgstr "Fluxul acesta nu conține date."
+#, fuzzy
+#~ msgid ""
+#~ "Failed to configure LAME mp3 audio encoder. Check your encoding "
+#~ "parameters."
+#~ msgstr ""
+#~ "Nu s-a putut configura codorul TwoLAME. Verificați parametrii de codare."
+
+#~ msgid ""
+#~ "The requested bitrate %d kbit/s for property '%s' is not allowed. The "
+#~ "bitrate was changed to %d kbit/s."
+#~ msgstr ""
+#~ "Rata de biți solicitată de %d kbiți/s pentru proprietatea „%s” nu este "
+#~ "permisă. Rata de biți a fost modificată la %d kbiți/s."
+
+#~ msgid "Failed to configure TwoLAME encoder. Check your encoding parameters."
+#~ msgstr ""
+#~ "Nu s-a putut configura codorul TwoLAME. Verificați parametrii de codare."
+
#~ msgid "Internal data stream error."
#~ msgstr "Eroare internă a fluxului de date."
diff --git a/po/ru.gmo b/po/ru.gmo
index 11e88f3..707c5cc 100644
--- a/po/ru.gmo
+++ b/po/ru.gmo
Binary files differ
diff --git a/po/ru.po b/po/ru.po
index 3e2f409..d9fa20e 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: gst-plugins-ugly 1.0.3\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n"
-"POT-Creation-Date: 2017-12-07 19:26+0200\n"
+"POT-Creation-Date: 2018-02-15 17:10+0000\n"
"PO-Revision-Date: 2012-12-01 13:38+0400\n"
"Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
"Language-Team: Russian <gnu@mx.ru>\n"
@@ -58,27 +58,27 @@
msgid "Could not read DVD."
msgstr "Не удалось прочесть DVD."
-msgid ""
-"Failed to configure LAME mp3 audio encoder. Check your encoding parameters."
-msgstr ""
-"Не удалось настроить аудио-кодировщик mp3 LAME. Проверьте параметры "
-"кодирования."
-
-#, c-format
-msgid ""
-"The requested bitrate %d kbit/s for property '%s' is not allowed. The "
-"bitrate was changed to %d kbit/s."
-msgstr ""
-"Запрошенный битрейт в %d кбит/с для свойства «%s» недопустим. Битрейт был "
-"изменён на %d кбит/с."
-
-msgid "Failed to configure TwoLAME encoder. Check your encoding parameters."
-msgstr ""
-"Не удалось настроить кодировщик TwoLAME. Проверьте параметры кодирования."
-
msgid "This stream contains no data."
msgstr "Поток не содержит данных."
+#~ msgid ""
+#~ "Failed to configure LAME mp3 audio encoder. Check your encoding "
+#~ "parameters."
+#~ msgstr ""
+#~ "Не удалось настроить аудио-кодировщик mp3 LAME. Проверьте параметры "
+#~ "кодирования."
+
+#~ msgid ""
+#~ "The requested bitrate %d kbit/s for property '%s' is not allowed. The "
+#~ "bitrate was changed to %d kbit/s."
+#~ msgstr ""
+#~ "Запрошенный битрейт в %d кбит/с для свойства «%s» недопустим. Битрейт был "
+#~ "изменён на %d кбит/с."
+
+#~ msgid "Failed to configure TwoLAME encoder. Check your encoding parameters."
+#~ msgstr ""
+#~ "Не удалось настроить кодировщик TwoLAME. Проверьте параметры кодирования."
+
#~ msgid "Internal data stream error."
#~ msgstr "Внутренняя ошибка потока данных."
diff --git a/po/sk.gmo b/po/sk.gmo
index 162e500..47c44a6 100644
--- a/po/sk.gmo
+++ b/po/sk.gmo
Binary files differ
diff --git a/po/sk.po b/po/sk.po
index 1a56173..93bdd88 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: gst-plugins-ugly 1.2.1\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n"
-"POT-Creation-Date: 2017-12-07 19:26+0200\n"
+"POT-Creation-Date: 2018-02-15 17:10+0000\n"
"PO-Revision-Date: 2014-01-30 10:28+0100\n"
"Last-Translator: Peter Tuharsky <tuharsky@misbb.sk>\n"
"Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -58,28 +58,28 @@
msgid "Could not read DVD."
msgstr "Nepodarilo sa čítať DVD."
-msgid ""
-"Failed to configure LAME mp3 audio encoder. Check your encoding parameters."
-msgstr ""
-"Nepodarilo sa nastaviť LAME mp3 enkodér. Skontrolujte svoje kódovacie "
-"nastavenia, prosím."
-
-#, c-format
-msgid ""
-"The requested bitrate %d kbit/s for property '%s' is not allowed. The "
-"bitrate was changed to %d kbit/s."
-msgstr ""
-"Požadovaná bitová rýchlosť %d kbit/s pre vlastnosť '%s' nie je dovolená. "
-"Bitová rýchlosť bola nastavená na %d kbit/s."
-
-msgid "Failed to configure TwoLAME encoder. Check your encoding parameters."
-msgstr ""
-"Nepodarilo sa nastaviť TwoLAME enkodér. Skontrolujte svoje kódovacie "
-"nastavenia, prosím."
-
msgid "This stream contains no data."
msgstr "Tento prúd neobsahuje žiadne údaje."
+#~ msgid ""
+#~ "Failed to configure LAME mp3 audio encoder. Check your encoding "
+#~ "parameters."
+#~ msgstr ""
+#~ "Nepodarilo sa nastaviť LAME mp3 enkodér. Skontrolujte svoje kódovacie "
+#~ "nastavenia, prosím."
+
+#~ msgid ""
+#~ "The requested bitrate %d kbit/s for property '%s' is not allowed. The "
+#~ "bitrate was changed to %d kbit/s."
+#~ msgstr ""
+#~ "Požadovaná bitová rýchlosť %d kbit/s pre vlastnosť '%s' nie je dovolená. "
+#~ "Bitová rýchlosť bola nastavená na %d kbit/s."
+
+#~ msgid "Failed to configure TwoLAME encoder. Check your encoding parameters."
+#~ msgstr ""
+#~ "Nepodarilo sa nastaviť TwoLAME enkodér. Skontrolujte svoje kódovacie "
+#~ "nastavenia, prosím."
+
#~ msgid "Internal data stream error."
#~ msgstr "Vnútorná chyba prúdu údajov."
diff --git a/po/sl.gmo b/po/sl.gmo
index 6c519db..3f8c008 100644
--- a/po/sl.gmo
+++ b/po/sl.gmo
Binary files differ
diff --git a/po/sl.po b/po/sl.po
index 709825e..a970781 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: gst-plugins-ugly 0.10.17.2\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n"
-"POT-Creation-Date: 2017-12-07 19:26+0200\n"
+"POT-Creation-Date: 2018-02-15 17:10+0000\n"
"PO-Revision-Date: 2012-03-26 22:48+0100\n"
"Last-Translator: Klemen Košir <klemen.kosir@gmx.com>\n"
"Language-Team: Slovenian <translation-team-sl@lists.sourceforge.net>\n"
@@ -55,27 +55,27 @@
msgid "Could not read DVD."
msgstr "DVD-ja ni mogoče prebrati."
-msgid ""
-"Failed to configure LAME mp3 audio encoder. Check your encoding parameters."
-msgstr ""
-"Napaka med nastavljanjem zvočnega kodirnika mp3 LAME. Preverite parametre "
-"kodiranja."
-
-#, c-format
-msgid ""
-"The requested bitrate %d kbit/s for property '%s' is not allowed. The "
-"bitrate was changed to %d kbit/s."
-msgstr ""
-"Zahtevana bitna hitrost %d kbit/s za lastnost \"%s\" ni dovoljena. Bitna "
-"hitrost je bila spremenjena na %d kbit/s."
-
-msgid "Failed to configure TwoLAME encoder. Check your encoding parameters."
-msgstr ""
-"Napaka med nastavljanjem kodirnika TwoLAME. Preverite parametre kodiranja."
-
msgid "This stream contains no data."
msgstr "Pretok ne vsebuje podatkov."
+#~ msgid ""
+#~ "Failed to configure LAME mp3 audio encoder. Check your encoding "
+#~ "parameters."
+#~ msgstr ""
+#~ "Napaka med nastavljanjem zvočnega kodirnika mp3 LAME. Preverite parametre "
+#~ "kodiranja."
+
+#~ msgid ""
+#~ "The requested bitrate %d kbit/s for property '%s' is not allowed. The "
+#~ "bitrate was changed to %d kbit/s."
+#~ msgstr ""
+#~ "Zahtevana bitna hitrost %d kbit/s za lastnost \"%s\" ni dovoljena. Bitna "
+#~ "hitrost je bila spremenjena na %d kbit/s."
+
+#~ msgid "Failed to configure TwoLAME encoder. Check your encoding parameters."
+#~ msgstr ""
+#~ "Napaka med nastavljanjem kodirnika TwoLAME. Preverite parametre kodiranja."
+
#~ msgid "Internal data stream error."
#~ msgstr "Notranja napaka pretoka podatkov."
diff --git a/po/sq.po b/po/sq.po
index 19cfa60..5b68812 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: gst-plugins 0.8.3\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n"
-"POT-Creation-Date: 2017-12-07 19:26+0200\n"
+"POT-Creation-Date: 2018-02-15 17:10+0000\n"
"PO-Revision-Date: 2004-08-07 20:29+0200\n"
"Last-Translator: Laurent Dhima <laurenti@alblinux.net>\n"
"Language-Team: Albanian <begraj@hotmail.com>\n"
@@ -52,19 +52,6 @@
msgid "Could not read DVD."
msgstr "I pamundur shkrimi tek file \"%s\"."
-msgid ""
-"Failed to configure LAME mp3 audio encoder. Check your encoding parameters."
-msgstr ""
-
-#, c-format
-msgid ""
-"The requested bitrate %d kbit/s for property '%s' is not allowed. The "
-"bitrate was changed to %d kbit/s."
-msgstr ""
-
-msgid "Failed to configure TwoLAME encoder. Check your encoding parameters."
-msgstr ""
-
msgid "This stream contains no data."
msgstr ""
diff --git a/po/sr.gmo b/po/sr.gmo
index f71a962..59f0d4e 100644
--- a/po/sr.gmo
+++ b/po/sr.gmo
Binary files differ
diff --git a/po/sr.po b/po/sr.po
index 223a714..1d6e589 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: gst-plugins-ugly-1.1.4\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n"
-"POT-Creation-Date: 2017-12-07 19:26+0200\n"
+"POT-Creation-Date: 2018-02-15 17:10+0000\n"
"PO-Revision-Date: 2013-10-03 22:30+0200\n"
"Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
"Language-Team: Serbian <(nothing)>\n"
@@ -55,26 +55,26 @@
msgid "Could not read DVD."
msgstr "Не могу да читам ДВД."
-msgid ""
-"Failed to configure LAME mp3 audio encoder. Check your encoding parameters."
-msgstr ""
-"Нисам успео да подесим енкодер звука ЛАМЕ мп3. Проверите ваше параметре "
-"кодирања."
-
-#, c-format
-msgid ""
-"The requested bitrate %d kbit/s for property '%s' is not allowed. The "
-"bitrate was changed to %d kbit/s."
-msgstr ""
-"Тражени проток података од %d kbit/s за „%s“ није допуштен. Проток података "
-"је постављен на %d kbit/s."
-
-msgid "Failed to configure TwoLAME encoder. Check your encoding parameters."
-msgstr ""
-"Нисам успео да подесим ДваЛАМЕ енкодер. Проверите ваше параметре кодирања."
-
msgid "This stream contains no data."
msgstr "Овај ток не садржи податке."
+#~ msgid ""
+#~ "Failed to configure LAME mp3 audio encoder. Check your encoding "
+#~ "parameters."
+#~ msgstr ""
+#~ "Нисам успео да подесим енкодер звука ЛАМЕ мп3. Проверите ваше параметре "
+#~ "кодирања."
+
+#~ msgid ""
+#~ "The requested bitrate %d kbit/s for property '%s' is not allowed. The "
+#~ "bitrate was changed to %d kbit/s."
+#~ msgstr ""
+#~ "Тражени проток података од %d kbit/s за „%s“ није допуштен. Проток "
+#~ "података је постављен на %d kbit/s."
+
+#~ msgid "Failed to configure TwoLAME encoder. Check your encoding parameters."
+#~ msgstr ""
+#~ "Нисам успео да подесим ДваЛАМЕ енкодер. Проверите ваше параметре кодирања."
+
#~ msgid "Internal data stream error."
#~ msgstr "Унутрашња грешка тока података."
diff --git a/po/sv.gmo b/po/sv.gmo
index 92d3216..5f44bd4 100644
--- a/po/sv.gmo
+++ b/po/sv.gmo
Binary files differ
diff --git a/po/sv.po b/po/sv.po
index ad5d4ef..948776d 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: gst-plugins-ugly 1.6.0\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n"
-"POT-Creation-Date: 2017-12-07 19:26+0200\n"
+"POT-Creation-Date: 2018-02-15 17:10+0000\n"
"PO-Revision-Date: 2015-10-31 16:08+0100\n"
"Last-Translator: Sebastian Rasmussen <sebras@gmail.com>\n"
"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -57,27 +57,27 @@
msgid "Could not read DVD."
msgstr "Kunde inte läsa dvd."
-msgid ""
-"Failed to configure LAME mp3 audio encoder. Check your encoding parameters."
-msgstr ""
-"Misslyckades med att konfigurera LAME mp3 ljudkodare. Kontrollera dina "
-"kodningsparametrar."
-
-#, c-format
-msgid ""
-"The requested bitrate %d kbit/s for property '%s' is not allowed. The "
-"bitrate was changed to %d kbit/s."
-msgstr ""
-"Den begärda bitfrekvensen %d kbit/s för egenskapen \"%s\" tillåts inte. "
-"Bitfrekvensen ändrades till %d kbit/s."
-
-msgid "Failed to configure TwoLAME encoder. Check your encoding parameters."
-msgstr ""
-"Misslyckades med att konfigurera TwoLAME-kodaren. Kontrollera dina "
-"kodningsparametrar."
-
msgid "This stream contains no data."
msgstr "Den här strömmen innehåller inget data."
+#~ msgid ""
+#~ "Failed to configure LAME mp3 audio encoder. Check your encoding "
+#~ "parameters."
+#~ msgstr ""
+#~ "Misslyckades med att konfigurera LAME mp3 ljudkodare. Kontrollera dina "
+#~ "kodningsparametrar."
+
+#~ msgid ""
+#~ "The requested bitrate %d kbit/s for property '%s' is not allowed. The "
+#~ "bitrate was changed to %d kbit/s."
+#~ msgstr ""
+#~ "Den begärda bitfrekvensen %d kbit/s för egenskapen \"%s\" tillåts inte. "
+#~ "Bitfrekvensen ändrades till %d kbit/s."
+
+#~ msgid "Failed to configure TwoLAME encoder. Check your encoding parameters."
+#~ msgstr ""
+#~ "Misslyckades med att konfigurera TwoLAME-kodaren. Kontrollera dina "
+#~ "kodningsparametrar."
+
#~ msgid "Internal data stream error."
#~ msgstr "Fel i intern dataström."
diff --git a/po/tr.gmo b/po/tr.gmo
index de1f2c8..ed03bbd 100644
--- a/po/tr.gmo
+++ b/po/tr.gmo
Binary files differ
diff --git a/po/tr.po b/po/tr.po
index 56a8a7f..14b665e 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: gst-plugins-ugly-1.0.3\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n"
-"POT-Creation-Date: 2017-12-07 19:26+0200\n"
+"POT-Creation-Date: 2018-02-15 17:10+0000\n"
"PO-Revision-Date: 2012-12-01 01:19+0200\n"
"Last-Translator: Server Acim <serveracim@gmail.com>\n"
"Language-Team: Turkish <gnu-tr-u12a@lists.sourceforge.net>\n"
@@ -54,26 +54,28 @@
msgid "Could not read DVD."
msgstr "DVD okunamıyor."
-msgid ""
-"Failed to configure LAME mp3 audio encoder. Check your encoding parameters."
-msgstr ""
-"LAME mp3 kodlayıcı yapılandırılamadı. Kodlama parametrelerinizi denetleyiniz."
-
-#, c-format
-msgid ""
-"The requested bitrate %d kbit/s for property '%s' is not allowed. The "
-"bitrate was changed to %d kbit/s."
-msgstr ""
-"İstenen bit oranı %d kbit/s bu özellik için '%s' onaylanmadı. Bu yüzden bit "
-"oranı şuna dönüştürüldü %d kbit/s."
-
-msgid "Failed to configure TwoLAME encoder. Check your encoding parameters."
-msgstr ""
-"TwoLAME kodlayıcı yapılandırılamadı. Kodlama parametrelerinizi denetleyiniz."
-
msgid "This stream contains no data."
msgstr "Akış veri içermiyor."
+#~ msgid ""
+#~ "Failed to configure LAME mp3 audio encoder. Check your encoding "
+#~ "parameters."
+#~ msgstr ""
+#~ "LAME mp3 kodlayıcı yapılandırılamadı. Kodlama parametrelerinizi "
+#~ "denetleyiniz."
+
+#~ msgid ""
+#~ "The requested bitrate %d kbit/s for property '%s' is not allowed. The "
+#~ "bitrate was changed to %d kbit/s."
+#~ msgstr ""
+#~ "İstenen bit oranı %d kbit/s bu özellik için '%s' onaylanmadı. Bu yüzden "
+#~ "bit oranı şuna dönüştürüldü %d kbit/s."
+
+#~ msgid "Failed to configure TwoLAME encoder. Check your encoding parameters."
+#~ msgstr ""
+#~ "TwoLAME kodlayıcı yapılandırılamadı. Kodlama parametrelerinizi "
+#~ "denetleyiniz."
+
#~ msgid "Internal data stream error."
#~ msgstr "İç veri akış hatası."
diff --git a/po/uk.gmo b/po/uk.gmo
index 34985e4..7bff551 100644
--- a/po/uk.gmo
+++ b/po/uk.gmo
Binary files differ
diff --git a/po/uk.po b/po/uk.po
index efc1ecf..fca92d5 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: gst-plugins-ugly 1.0.3\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n"
-"POT-Creation-Date: 2017-12-07 19:26+0200\n"
+"POT-Creation-Date: 2018-02-15 17:10+0000\n"
"PO-Revision-Date: 2012-11-28 20:25+0200\n"
"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
"Language-Team: Ukrainian <translation-team-uk@lists.sourceforge.net>\n"
@@ -58,28 +58,28 @@
msgid "Could not read DVD."
msgstr "Не вдалося прочитати DVD."
-msgid ""
-"Failed to configure LAME mp3 audio encoder. Check your encoding parameters."
-msgstr ""
-"Помилка при налаштовуванні кодера LAME для звукових даних у форматі MP3. "
-"Перевірте параметри кодування."
-
-#, c-format
-msgid ""
-"The requested bitrate %d kbit/s for property '%s' is not allowed. The "
-"bitrate was changed to %d kbit/s."
-msgstr ""
-"Запитана бітова швидкість %d кбіт/с для властивості «%s» є неприпустимою. "
-"Бітову швидкість змінено на %d кбіт/с."
-
-msgid "Failed to configure TwoLAME encoder. Check your encoding parameters."
-msgstr ""
-"Помилка при налаштовуванні кодувальника TwoLAME. Перевірте параметри "
-"кодування."
-
msgid "This stream contains no data."
msgstr "Потік не містить даних."
+#~ msgid ""
+#~ "Failed to configure LAME mp3 audio encoder. Check your encoding "
+#~ "parameters."
+#~ msgstr ""
+#~ "Помилка при налаштовуванні кодера LAME для звукових даних у форматі MP3. "
+#~ "Перевірте параметри кодування."
+
+#~ msgid ""
+#~ "The requested bitrate %d kbit/s for property '%s' is not allowed. The "
+#~ "bitrate was changed to %d kbit/s."
+#~ msgstr ""
+#~ "Запитана бітова швидкість %d кбіт/с для властивості «%s» є неприпустимою. "
+#~ "Бітову швидкість змінено на %d кбіт/с."
+
+#~ msgid "Failed to configure TwoLAME encoder. Check your encoding parameters."
+#~ msgstr ""
+#~ "Помилка при налаштовуванні кодувальника TwoLAME. Перевірте параметри "
+#~ "кодування."
+
#~ msgid "Internal data stream error."
#~ msgstr "Помилка внутрішнього потоку даних."
diff --git a/po/vi.gmo b/po/vi.gmo
index 2fed887..5c82691 100644
--- a/po/vi.gmo
+++ b/po/vi.gmo
Binary files differ
diff --git a/po/vi.po b/po/vi.po
index 4643223..338ede6 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: gst-plugins-ugly 1.3.90\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n"
-"POT-Creation-Date: 2017-12-07 19:26+0200\n"
+"POT-Creation-Date: 2018-02-15 17:10+0000\n"
"PO-Revision-Date: 2014-06-30 09:20+0700\n"
"Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n"
"Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n"
@@ -58,27 +58,27 @@
msgid "Could not read DVD."
msgstr "Không thể đọc đĩa DVD."
-msgid ""
-"Failed to configure LAME mp3 audio encoder. Check your encoding parameters."
-msgstr ""
-"Gặp lỗi khi cấu hình bộ giải mã âm thanh mp3 của LAME. Hãy kiểm tra các tham "
-"số giải mã."
-
-#, c-format
-msgid ""
-"The requested bitrate %d kbit/s for property '%s' is not allowed. The "
-"bitrate was changed to %d kbit/s."
-msgstr ""
-"Không cho phép tỷ lệ đã yêu cầu %d kbit/giây cho thuộc tính “%s” nên tỷ lệ "
-"bit bị thay đổi thành %d kbit/g."
-
-msgid "Failed to configure TwoLAME encoder. Check your encoding parameters."
-msgstr ""
-"Gặp lỗi khi cấu hình bộ biên mã TwoLAME. Hãy kiểm tra lại các tham số giải "
-"mã."
-
msgid "This stream contains no data."
msgstr "Luồng này không chứa dữ liệu."
+#~ msgid ""
+#~ "Failed to configure LAME mp3 audio encoder. Check your encoding "
+#~ "parameters."
+#~ msgstr ""
+#~ "Gặp lỗi khi cấu hình bộ giải mã âm thanh mp3 của LAME. Hãy kiểm tra các "
+#~ "tham số giải mã."
+
+#~ msgid ""
+#~ "The requested bitrate %d kbit/s for property '%s' is not allowed. The "
+#~ "bitrate was changed to %d kbit/s."
+#~ msgstr ""
+#~ "Không cho phép tỷ lệ đã yêu cầu %d kbit/giây cho thuộc tính “%s” nên tỷ "
+#~ "lệ bit bị thay đổi thành %d kbit/g."
+
+#~ msgid "Failed to configure TwoLAME encoder. Check your encoding parameters."
+#~ msgstr ""
+#~ "Gặp lỗi khi cấu hình bộ biên mã TwoLAME. Hãy kiểm tra lại các tham số "
+#~ "giải mã."
+
#~ msgid "Internal data stream error."
#~ msgstr "Lỗi luồng dữ liệu nội bộ."
diff --git a/po/zh_CN.gmo b/po/zh_CN.gmo
index 49add6f..109b4c0 100644
--- a/po/zh_CN.gmo
+++ b/po/zh_CN.gmo
Binary files differ
diff --git a/po/zh_CN.po b/po/zh_CN.po
index c6505d1..b1eceee 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -10,7 +10,7 @@
msgstr ""
"Project-Id-Version: gst-plugins-ugly 1.5.1\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n"
-"POT-Creation-Date: 2017-12-07 19:26+0200\n"
+"POT-Creation-Date: 2018-02-15 17:10+0000\n"
"PO-Revision-Date: 2015-08-28 15:36+0800\n"
"Last-Translator: Mingye Wang <arthur200126@gmail.com>\n"
"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
@@ -54,22 +54,22 @@
msgid "Could not read DVD."
msgstr "无法读取 DVD。"
-msgid ""
-"Failed to configure LAME mp3 audio encoder. Check your encoding parameters."
-msgstr "配置 LAME mp3 编码器失败. 请检查你的编码参数."
-
-#, c-format
-msgid ""
-"The requested bitrate %d kbit/s for property '%s' is not allowed. The "
-"bitrate was changed to %d kbit/s."
-msgstr "不允许的比特率 %d kbit/s 于 '%s'. 比特率已改变成 %d kbit/s."
-
-msgid "Failed to configure TwoLAME encoder. Check your encoding parameters."
-msgstr "设置 TwoLAME 编码器失败. 请检查你的编码参数."
-
msgid "This stream contains no data."
msgstr "这个串流中没有包含数据."
+#~ msgid ""
+#~ "Failed to configure LAME mp3 audio encoder. Check your encoding "
+#~ "parameters."
+#~ msgstr "配置 LAME mp3 编码器失败. 请检查你的编码参数."
+
+#~ msgid ""
+#~ "The requested bitrate %d kbit/s for property '%s' is not allowed. The "
+#~ "bitrate was changed to %d kbit/s."
+#~ msgstr "不允许的比特率 %d kbit/s 于 '%s'. 比特率已改变成 %d kbit/s."
+
+#~ msgid "Failed to configure TwoLAME encoder. Check your encoding parameters."
+#~ msgstr "设置 TwoLAME 编码器失败. 请检查你的编码参数."
+
#~ msgid "Internal data stream error."
#~ msgstr "内部数据流错误。"
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 313f31b..d109aa9 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -257,6 +257,7 @@
ERROR_CFLAGS = @ERROR_CFLAGS@
ERROR_CXXFLAGS = @ERROR_CXXFLAGS@
EXEEXT = @EXEEXT@
+EXTRA_CFLAGS = @EXTRA_CFLAGS@
FFLAGS = @FFLAGS@
FGREP = @FGREP@
GCOV = @GCOV@
@@ -308,7 +309,6 @@
GST_PLUGINS_NONPORTED = @GST_PLUGINS_NONPORTED@
GST_PLUGINS_SELECTED = @GST_PLUGINS_SELECTED@
GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
-GST_PLUGIN_LIBTOOLFLAGS = @GST_PLUGIN_LIBTOOLFLAGS@
GST_PREFIX = @GST_PREFIX@
GST_REVISION = @GST_REVISION@
GST_TOOLS_DIR = @GST_TOOLS_DIR@
@@ -319,7 +319,6 @@
GTKDOC_REBASE = @GTKDOC_REBASE@
HAVE_CXX = @HAVE_CXX@
HAVE_DVDREAD = @HAVE_DVDREAD@
-HAVE_LAME = @HAVE_LAME@
HTML_DIR = @HTML_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
@@ -328,8 +327,6 @@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INTLLIBS = @INTLLIBS@
INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-LAME_CFLAGS = @LAME_CFLAGS@
-LAME_LIBS = @LAME_LIBS@
LD = @LD@
LDFLAGS = @LDFLAGS@
LIBICONV = @LIBICONV@
@@ -351,8 +348,6 @@
MKDIR_P = @MKDIR_P@
MPEG2DEC_CFLAGS = @MPEG2DEC_CFLAGS@
MPEG2DEC_LIBS = @MPEG2DEC_LIBS@
-MPG123_CFLAGS = @MPG123_CFLAGS@
-MPG123_LIBS = @MPG123_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_015 = @MSGFMT_015@
MSGMERGE = @MSGMERGE@
@@ -395,13 +390,13 @@
SIDPLAY_CFLAGS = @SIDPLAY_CFLAGS@
SIDPLAY_LIBS = @SIDPLAY_LIBS@
STRIP = @STRIP@
-TWOLAME_CFLAGS = @TWOLAME_CFLAGS@
-TWOLAME_LIBS = @TWOLAME_LIBS@
USE_NLS = @USE_NLS@
VALGRIND_CFLAGS = @VALGRIND_CFLAGS@
VALGRIND_LIBS = @VALGRIND_LIBS@
VALGRIND_PATH = @VALGRIND_PATH@
VERSION = @VERSION@
+VISIBILITY_CFLAGS = @VISIBILITY_CFLAGS@
+VISIBILITY_CXXFLAGS = @VISIBILITY_CXXFLAGS@
WARNING_CFLAGS = @WARNING_CFLAGS@
WARNING_CXXFLAGS = @WARNING_CXXFLAGS@
WIN32_LIBS = @WIN32_LIBS@
diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am
index 06be57a..31eb4bf 100644
--- a/tests/check/Makefile.am
+++ b/tests/check/Makefile.am
@@ -26,24 +26,12 @@
AMRNB =
endif
-if USE_LAME
-LAME = pipelines/lame
-else
-LAME =
-endif
-
if USE_MPEG2DEC
MPEG2DEC = elements/mpeg2dec
else
MPEG2DEC =
endif
-if USE_MPG123
-check_mpg123 = elements/mpg123audiodec
-else
-check_mpg123 =
-endif
-
if USE_X264
check_x264enc=elements/x264enc
else
@@ -60,9 +48,7 @@
check_PROGRAMS = \
generic/states \
$(AMRNB) \
- $(LAME) \
$(MPEG2DEC) \
- $(check_mpg123) \
$(check_x264enc) \
$(check_xingmux)
@@ -86,12 +72,8 @@
elements_amrnbenc_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(AM_CFLAGS)
elements_amrnbenc_LDADD = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_API_VERSION) $(LDADD)
-elements_cmmldec_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(AM_CFLAGS)
-elements_cmmlenc_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(AM_CFLAGS)
-
-elements_mpg123audiodec_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(AM_CFLAGS)
-elements_mpg123audiodec_LDADD = \
- $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(GST_LIBS) $(LDADD) \
- -lgstaudio-@GST_API_VERSION@ -lgstfft-@GST_API_VERSION@ -lgstapp-@GST_API_VERSION@
+elements_mpeg2dec_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(AM_CFLAGS)
+elements_mpeg2dec_LDADD = $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(GST_LIBS) $(LDADD) \
+ -lgstvideo-@GST_API_VERSION@
EXTRA_DIST = gst-plugins-ugly.supp
diff --git a/tests/check/Makefile.in b/tests/check/Makefile.in
index c523cc8..5e8b0c9 100644
--- a/tests/check/Makefile.in
+++ b/tests/check/Makefile.in
@@ -91,8 +91,7 @@
host_triplet = @host@
target_triplet = @target@
check_PROGRAMS = generic/states$(EXEEXT) $(am__EXEEXT_1) \
- $(am__EXEEXT_2) $(am__EXEEXT_3) $(am__EXEEXT_4) \
- $(am__EXEEXT_5) $(am__EXEEXT_6)
+ $(am__EXEEXT_2) $(am__EXEEXT_3) $(am__EXEEXT_4)
noinst_PROGRAMS =
subdir = tests/check
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -136,11 +135,9 @@
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
@USE_AMRNB_TRUE@am__EXEEXT_1 = elements/amrnbenc$(EXEEXT)
-@USE_LAME_TRUE@am__EXEEXT_2 = pipelines/lame$(EXEEXT)
-@USE_MPEG2DEC_TRUE@am__EXEEXT_3 = elements/mpeg2dec$(EXEEXT)
-@USE_MPG123_TRUE@am__EXEEXT_4 = elements/mpg123audiodec$(EXEEXT)
-@USE_X264_TRUE@am__EXEEXT_5 = elements/x264enc$(EXEEXT)
-@USE_PLUGIN_XINGMUX_TRUE@am__EXEEXT_6 = elements/xingmux$(EXEEXT)
+@USE_MPEG2DEC_TRUE@am__EXEEXT_2 = elements/mpeg2dec$(EXEEXT)
+@USE_X264_TRUE@am__EXEEXT_3 = elements/x264enc$(EXEEXT)
+@USE_PLUGIN_XINGMUX_TRUE@am__EXEEXT_4 = elements/xingmux$(EXEEXT)
PROGRAMS = $(noinst_PROGRAMS)
elements_amrnbenc_SOURCES = elements/amrnbenc.c
am__dirstamp = $(am__leading_dot)dirstamp
@@ -159,19 +156,15 @@
$(elements_amrnbenc_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
-o $@
elements_mpeg2dec_SOURCES = elements/mpeg2dec.c
-elements_mpeg2dec_OBJECTS = elements/mpeg2dec.$(OBJEXT)
-elements_mpeg2dec_LDADD = $(LDADD)
-elements_mpeg2dec_DEPENDENCIES = $(am__DEPENDENCIES_1)
-elements_mpg123audiodec_SOURCES = elements/mpg123audiodec.c
-elements_mpg123audiodec_OBJECTS = \
- elements/elements_mpg123audiodec-mpg123audiodec.$(OBJEXT)
-elements_mpg123audiodec_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+elements_mpeg2dec_OBJECTS = \
+ elements/elements_mpeg2dec-mpeg2dec.$(OBJEXT)
+elements_mpeg2dec_DEPENDENCIES = $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_2)
-elements_mpg123audiodec_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+elements_mpeg2dec_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
- $(elements_mpg123audiodec_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
- $(LDFLAGS) -o $@
+ $(elements_mpeg2dec_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
+ -o $@
elements_x264enc_SOURCES = elements/x264enc.c
elements_x264enc_OBJECTS = elements/x264enc.$(OBJEXT)
elements_x264enc_LDADD = $(LDADD)
@@ -184,10 +177,6 @@
generic_states_OBJECTS = generic/states.$(OBJEXT)
generic_states_LDADD = $(LDADD)
generic_states_DEPENDENCIES = $(am__DEPENDENCIES_1)
-pipelines_lame_SOURCES = pipelines/lame.c
-pipelines_lame_OBJECTS = pipelines/lame.$(OBJEXT)
-pipelines_lame_LDADD = $(LDADD)
-pipelines_lame_DEPENDENCIES = $(am__DEPENDENCIES_1)
AM_V_P = $(am__v_P_@AM_V@)
am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
am__v_P_0 = false
@@ -222,12 +211,10 @@
am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
am__v_CCLD_0 = @echo " CCLD " $@;
am__v_CCLD_1 =
-SOURCES = elements/amrnbenc.c elements/mpeg2dec.c \
- elements/mpg123audiodec.c elements/x264enc.c \
- elements/xingmux.c generic/states.c pipelines/lame.c
+SOURCES = elements/amrnbenc.c elements/mpeg2dec.c elements/x264enc.c \
+ elements/xingmux.c generic/states.c
DIST_SOURCES = elements/amrnbenc.c elements/mpeg2dec.c \
- elements/mpg123audiodec.c elements/x264enc.c \
- elements/xingmux.c generic/states.c pipelines/lame.c
+ elements/x264enc.c elements/xingmux.c generic/states.c
am__can_run_installinfo = \
case $$AM_UPDATE_INFO_DIR in \
n|no|NO) false;; \
@@ -508,6 +495,7 @@
ERROR_CFLAGS = @ERROR_CFLAGS@
ERROR_CXXFLAGS = @ERROR_CXXFLAGS@
EXEEXT = @EXEEXT@
+EXTRA_CFLAGS = @EXTRA_CFLAGS@
FFLAGS = @FFLAGS@
FGREP = @FGREP@
GCOV = @GCOV@
@@ -559,7 +547,6 @@
GST_PLUGINS_NONPORTED = @GST_PLUGINS_NONPORTED@
GST_PLUGINS_SELECTED = @GST_PLUGINS_SELECTED@
GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
-GST_PLUGIN_LIBTOOLFLAGS = @GST_PLUGIN_LIBTOOLFLAGS@
GST_PREFIX = @GST_PREFIX@
GST_REVISION = @GST_REVISION@
GST_TOOLS_DIR = @GST_TOOLS_DIR@
@@ -570,7 +557,6 @@
GTKDOC_REBASE = @GTKDOC_REBASE@
HAVE_CXX = @HAVE_CXX@
HAVE_DVDREAD = @HAVE_DVDREAD@
-HAVE_LAME = @HAVE_LAME@
HTML_DIR = @HTML_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
@@ -579,8 +565,6 @@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INTLLIBS = @INTLLIBS@
INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-LAME_CFLAGS = @LAME_CFLAGS@
-LAME_LIBS = @LAME_LIBS@
LD = @LD@
LDFLAGS = @LDFLAGS@
LIBICONV = @LIBICONV@
@@ -602,8 +586,6 @@
MKDIR_P = @MKDIR_P@
MPEG2DEC_CFLAGS = @MPEG2DEC_CFLAGS@
MPEG2DEC_LIBS = @MPEG2DEC_LIBS@
-MPG123_CFLAGS = @MPG123_CFLAGS@
-MPG123_LIBS = @MPG123_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_015 = @MSGFMT_015@
MSGMERGE = @MSGMERGE@
@@ -646,13 +628,13 @@
SIDPLAY_CFLAGS = @SIDPLAY_CFLAGS@
SIDPLAY_LIBS = @SIDPLAY_LIBS@
STRIP = @STRIP@
-TWOLAME_CFLAGS = @TWOLAME_CFLAGS@
-TWOLAME_LIBS = @TWOLAME_LIBS@
USE_NLS = @USE_NLS@
VALGRIND_CFLAGS = @VALGRIND_CFLAGS@
VALGRIND_LIBS = @VALGRIND_LIBS@
VALGRIND_PATH = @VALGRIND_PATH@
VERSION = @VERSION@
+VISIBILITY_CFLAGS = @VISIBILITY_CFLAGS@
+VISIBILITY_CXXFLAGS = @VISIBILITY_CXXFLAGS@
WARNING_CFLAGS = @WARNING_CFLAGS@
WARNING_CXXFLAGS = @WARNING_CXXFLAGS@
WIN32_LIBS = @WIN32_LIBS@
@@ -743,12 +725,8 @@
TESTS = $(check_PROGRAMS)
@USE_AMRNB_FALSE@AMRNB =
@USE_AMRNB_TRUE@AMRNB = elements/amrnbenc
-@USE_LAME_FALSE@LAME =
-@USE_LAME_TRUE@LAME = pipelines/lame
@USE_MPEG2DEC_FALSE@MPEG2DEC =
@USE_MPEG2DEC_TRUE@MPEG2DEC = elements/mpeg2dec
-@USE_MPG123_FALSE@check_mpg123 =
-@USE_MPG123_TRUE@check_mpg123 = elements/mpg123audiodec
@USE_X264_FALSE@check_x264enc =
@USE_X264_TRUE@check_x264enc = elements/x264enc
@USE_PLUGIN_XINGMUX_FALSE@check_xingmux =
@@ -768,12 +746,9 @@
SUPPRESSIONS = $(top_srcdir)/common/gst.supp $(srcdir)/gst-plugins-ugly.supp
elements_amrnbenc_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(AM_CFLAGS)
elements_amrnbenc_LDADD = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_API_VERSION) $(LDADD)
-elements_cmmldec_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(AM_CFLAGS)
-elements_cmmlenc_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(AM_CFLAGS)
-elements_mpg123audiodec_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(AM_CFLAGS)
-elements_mpg123audiodec_LDADD = \
- $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(GST_LIBS) $(LDADD) \
- -lgstaudio-@GST_API_VERSION@ -lgstfft-@GST_API_VERSION@ -lgstapp-@GST_API_VERSION@
+elements_mpeg2dec_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(AM_CFLAGS)
+elements_mpeg2dec_LDADD = $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(GST_LIBS) $(LDADD) \
+ -lgstvideo-@GST_API_VERSION@
EXTRA_DIST = gst-plugins-ugly.supp
all: all-am
@@ -840,18 +815,12 @@
elements/amrnbenc$(EXEEXT): $(elements_amrnbenc_OBJECTS) $(elements_amrnbenc_DEPENDENCIES) $(EXTRA_elements_amrnbenc_DEPENDENCIES) elements/$(am__dirstamp)
@rm -f elements/amrnbenc$(EXEEXT)
$(AM_V_CCLD)$(elements_amrnbenc_LINK) $(elements_amrnbenc_OBJECTS) $(elements_amrnbenc_LDADD) $(LIBS)
-elements/mpeg2dec.$(OBJEXT): elements/$(am__dirstamp) \
- elements/$(DEPDIR)/$(am__dirstamp)
+elements/elements_mpeg2dec-mpeg2dec.$(OBJEXT): \
+ elements/$(am__dirstamp) elements/$(DEPDIR)/$(am__dirstamp)
elements/mpeg2dec$(EXEEXT): $(elements_mpeg2dec_OBJECTS) $(elements_mpeg2dec_DEPENDENCIES) $(EXTRA_elements_mpeg2dec_DEPENDENCIES) elements/$(am__dirstamp)
@rm -f elements/mpeg2dec$(EXEEXT)
- $(AM_V_CCLD)$(LINK) $(elements_mpeg2dec_OBJECTS) $(elements_mpeg2dec_LDADD) $(LIBS)
-elements/elements_mpg123audiodec-mpg123audiodec.$(OBJEXT): \
- elements/$(am__dirstamp) elements/$(DEPDIR)/$(am__dirstamp)
-
-elements/mpg123audiodec$(EXEEXT): $(elements_mpg123audiodec_OBJECTS) $(elements_mpg123audiodec_DEPENDENCIES) $(EXTRA_elements_mpg123audiodec_DEPENDENCIES) elements/$(am__dirstamp)
- @rm -f elements/mpg123audiodec$(EXEEXT)
- $(AM_V_CCLD)$(elements_mpg123audiodec_LINK) $(elements_mpg123audiodec_OBJECTS) $(elements_mpg123audiodec_LDADD) $(LIBS)
+ $(AM_V_CCLD)$(elements_mpeg2dec_LINK) $(elements_mpeg2dec_OBJECTS) $(elements_mpeg2dec_LDADD) $(LIBS)
elements/x264enc.$(OBJEXT): elements/$(am__dirstamp) \
elements/$(DEPDIR)/$(am__dirstamp)
@@ -876,35 +845,20 @@
generic/states$(EXEEXT): $(generic_states_OBJECTS) $(generic_states_DEPENDENCIES) $(EXTRA_generic_states_DEPENDENCIES) generic/$(am__dirstamp)
@rm -f generic/states$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(generic_states_OBJECTS) $(generic_states_LDADD) $(LIBS)
-pipelines/$(am__dirstamp):
- @$(MKDIR_P) pipelines
- @: > pipelines/$(am__dirstamp)
-pipelines/$(DEPDIR)/$(am__dirstamp):
- @$(MKDIR_P) pipelines/$(DEPDIR)
- @: > pipelines/$(DEPDIR)/$(am__dirstamp)
-pipelines/lame.$(OBJEXT): pipelines/$(am__dirstamp) \
- pipelines/$(DEPDIR)/$(am__dirstamp)
-
-pipelines/lame$(EXEEXT): $(pipelines_lame_OBJECTS) $(pipelines_lame_DEPENDENCIES) $(EXTRA_pipelines_lame_DEPENDENCIES) pipelines/$(am__dirstamp)
- @rm -f pipelines/lame$(EXEEXT)
- $(AM_V_CCLD)$(LINK) $(pipelines_lame_OBJECTS) $(pipelines_lame_LDADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
-rm -f elements/*.$(OBJEXT)
-rm -f generic/*.$(OBJEXT)
- -rm -f pipelines/*.$(OBJEXT)
distclean-compile:
-rm -f *.tab.c
@AMDEP_TRUE@@am__include@ @am__quote@elements/$(DEPDIR)/elements_amrnbenc-amrnbenc.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@elements/$(DEPDIR)/elements_mpg123audiodec-mpg123audiodec.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@elements/$(DEPDIR)/mpeg2dec.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@elements/$(DEPDIR)/elements_mpeg2dec-mpeg2dec.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@elements/$(DEPDIR)/x264enc.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@elements/$(DEPDIR)/xingmux.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@generic/$(DEPDIR)/states.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@pipelines/$(DEPDIR)/lame.Po@am__quote@
.c.o:
@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
@@ -944,19 +898,19 @@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(elements_amrnbenc_CFLAGS) $(CFLAGS) -c -o elements/elements_amrnbenc-amrnbenc.obj `if test -f 'elements/amrnbenc.c'; then $(CYGPATH_W) 'elements/amrnbenc.c'; else $(CYGPATH_W) '$(srcdir)/elements/amrnbenc.c'; fi`
-elements/elements_mpg123audiodec-mpg123audiodec.o: elements/mpg123audiodec.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(elements_mpg123audiodec_CFLAGS) $(CFLAGS) -MT elements/elements_mpg123audiodec-mpg123audiodec.o -MD -MP -MF elements/$(DEPDIR)/elements_mpg123audiodec-mpg123audiodec.Tpo -c -o elements/elements_mpg123audiodec-mpg123audiodec.o `test -f 'elements/mpg123audiodec.c' || echo '$(srcdir)/'`elements/mpg123audiodec.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) elements/$(DEPDIR)/elements_mpg123audiodec-mpg123audiodec.Tpo elements/$(DEPDIR)/elements_mpg123audiodec-mpg123audiodec.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='elements/mpg123audiodec.c' object='elements/elements_mpg123audiodec-mpg123audiodec.o' libtool=no @AMDEPBACKSLASH@
+elements/elements_mpeg2dec-mpeg2dec.o: elements/mpeg2dec.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(elements_mpeg2dec_CFLAGS) $(CFLAGS) -MT elements/elements_mpeg2dec-mpeg2dec.o -MD -MP -MF elements/$(DEPDIR)/elements_mpeg2dec-mpeg2dec.Tpo -c -o elements/elements_mpeg2dec-mpeg2dec.o `test -f 'elements/mpeg2dec.c' || echo '$(srcdir)/'`elements/mpeg2dec.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) elements/$(DEPDIR)/elements_mpeg2dec-mpeg2dec.Tpo elements/$(DEPDIR)/elements_mpeg2dec-mpeg2dec.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='elements/mpeg2dec.c' object='elements/elements_mpeg2dec-mpeg2dec.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(elements_mpg123audiodec_CFLAGS) $(CFLAGS) -c -o elements/elements_mpg123audiodec-mpg123audiodec.o `test -f 'elements/mpg123audiodec.c' || echo '$(srcdir)/'`elements/mpg123audiodec.c
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(elements_mpeg2dec_CFLAGS) $(CFLAGS) -c -o elements/elements_mpeg2dec-mpeg2dec.o `test -f 'elements/mpeg2dec.c' || echo '$(srcdir)/'`elements/mpeg2dec.c
-elements/elements_mpg123audiodec-mpg123audiodec.obj: elements/mpg123audiodec.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(elements_mpg123audiodec_CFLAGS) $(CFLAGS) -MT elements/elements_mpg123audiodec-mpg123audiodec.obj -MD -MP -MF elements/$(DEPDIR)/elements_mpg123audiodec-mpg123audiodec.Tpo -c -o elements/elements_mpg123audiodec-mpg123audiodec.obj `if test -f 'elements/mpg123audiodec.c'; then $(CYGPATH_W) 'elements/mpg123audiodec.c'; else $(CYGPATH_W) '$(srcdir)/elements/mpg123audiodec.c'; fi`
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) elements/$(DEPDIR)/elements_mpg123audiodec-mpg123audiodec.Tpo elements/$(DEPDIR)/elements_mpg123audiodec-mpg123audiodec.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='elements/mpg123audiodec.c' object='elements/elements_mpg123audiodec-mpg123audiodec.obj' libtool=no @AMDEPBACKSLASH@
+elements/elements_mpeg2dec-mpeg2dec.obj: elements/mpeg2dec.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(elements_mpeg2dec_CFLAGS) $(CFLAGS) -MT elements/elements_mpeg2dec-mpeg2dec.obj -MD -MP -MF elements/$(DEPDIR)/elements_mpeg2dec-mpeg2dec.Tpo -c -o elements/elements_mpeg2dec-mpeg2dec.obj `if test -f 'elements/mpeg2dec.c'; then $(CYGPATH_W) 'elements/mpeg2dec.c'; else $(CYGPATH_W) '$(srcdir)/elements/mpeg2dec.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) elements/$(DEPDIR)/elements_mpeg2dec-mpeg2dec.Tpo elements/$(DEPDIR)/elements_mpeg2dec-mpeg2dec.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='elements/mpeg2dec.c' object='elements/elements_mpeg2dec-mpeg2dec.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(elements_mpg123audiodec_CFLAGS) $(CFLAGS) -c -o elements/elements_mpg123audiodec-mpg123audiodec.obj `if test -f 'elements/mpg123audiodec.c'; then $(CYGPATH_W) 'elements/mpg123audiodec.c'; else $(CYGPATH_W) '$(srcdir)/elements/mpg123audiodec.c'; fi`
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(elements_mpeg2dec_CFLAGS) $(CFLAGS) -c -o elements/elements_mpeg2dec-mpeg2dec.obj `if test -f 'elements/mpeg2dec.c'; then $(CYGPATH_W) 'elements/mpeg2dec.c'; else $(CYGPATH_W) '$(srcdir)/elements/mpeg2dec.c'; fi`
mostlyclean-libtool:
-rm -f *.lo
@@ -965,7 +919,6 @@
-rm -rf .libs _libs
-rm -rf elements/.libs elements/_libs
-rm -rf generic/.libs generic/_libs
- -rm -rf pipelines/.libs pipelines/_libs
ID: $(am__tagged_files)
$(am__define_uniq_tagged_files); mkid -fID $$unique
@@ -1174,13 +1127,6 @@
--log-file $$b.log --trs-file $$b.trs \
$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
"$$tst" $(AM_TESTS_FD_REDIRECT)
-pipelines/lame.log: pipelines/lame$(EXEEXT)
- @p='pipelines/lame$(EXEEXT)'; \
- b='pipelines/lame'; \
- $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
- --log-file $$b.log --trs-file $$b.trs \
- $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
- "$$tst" $(AM_TESTS_FD_REDIRECT)
elements/mpeg2dec.log: elements/mpeg2dec$(EXEEXT)
@p='elements/mpeg2dec$(EXEEXT)'; \
b='elements/mpeg2dec'; \
@@ -1188,13 +1134,6 @@
--log-file $$b.log --trs-file $$b.trs \
$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
"$$tst" $(AM_TESTS_FD_REDIRECT)
-elements/mpg123audiodec.log: elements/mpg123audiodec$(EXEEXT)
- @p='elements/mpg123audiodec$(EXEEXT)'; \
- b='elements/mpg123audiodec'; \
- $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
- --log-file $$b.log --trs-file $$b.trs \
- $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
- "$$tst" $(AM_TESTS_FD_REDIRECT)
elements/x264enc.log: elements/x264enc$(EXEEXT)
@p='elements/x264enc$(EXEEXT)'; \
b='elements/x264enc'; \
@@ -1294,8 +1233,6 @@
-rm -f elements/$(am__dirstamp)
-rm -f generic/$(DEPDIR)/$(am__dirstamp)
-rm -f generic/$(am__dirstamp)
- -rm -f pipelines/$(DEPDIR)/$(am__dirstamp)
- -rm -f pipelines/$(am__dirstamp)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -1306,7 +1243,7 @@
clean-noinstPROGRAMS mostlyclean-am
distclean: distclean-am
- -rm -rf elements/$(DEPDIR) generic/$(DEPDIR) pipelines/$(DEPDIR)
+ -rm -rf elements/$(DEPDIR) generic/$(DEPDIR)
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
distclean-tags
@@ -1352,7 +1289,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
- -rm -rf elements/$(DEPDIR) generic/$(DEPDIR) pipelines/$(DEPDIR)
+ -rm -rf elements/$(DEPDIR) generic/$(DEPDIR)
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
@@ -1483,7 +1420,11 @@
@$(AM_TESTS_ENVIRONMENT) \
CK_FORK=no \
$(LIBTOOL) --mode=execute \
- gdb $*
+ gdb $(GDB_ARGS) $*
+
+%.gdb-forever: %
+ @while $(MAKE) GDB_ARGS="-ex run -ex quit" $*.gdb ; do \
+ sleep 1; done
%.lcov-reset:
$(MAKE) $*.lcov-run
diff --git a/tests/check/elements/mpeg2dec.c b/tests/check/elements/mpeg2dec.c
index 14515c8..288a4d3 100644
--- a/tests/check/elements/mpeg2dec.c
+++ b/tests/check/elements/mpeg2dec.c
@@ -23,6 +23,7 @@
#include <unistd.h>
#include <gst/check/gstcheck.h>
+#include <gst/video/video-info.h>
/* For ease of programming we use globals to keep refs for our floating
* src and sink pads we create; otherwise we always have to do get_pad,
@@ -1749,6 +1750,7 @@
int i, num_buffers;
GstCaps *out_caps, *caps;
guint offset = 0;
+ GstVideoInfo info;
mpeg2dec = setup_mpeg2dec ();
@@ -1779,13 +1781,18 @@
fail_unless_equals_int (num_buffers, 30);
/* each buffer should have these caps */
- out_caps =
- gst_caps_new_simple ("video/x-raw", "format", G_TYPE_STRING,
- "I420", "width", G_TYPE_INT, 176, "height", G_TYPE_INT, 144,
- "pixel-aspect-ratio", GST_TYPE_FRACTION, 1, 1, "framerate",
- GST_TYPE_FRACTION, 25, 1, "interlace-mode", G_TYPE_STRING, "progressive",
- "chroma-site", G_TYPE_STRING, "mpeg2",
- "colorimetry", G_TYPE_STRING, "bt601", NULL);
+ gst_video_info_init (&info);
+ gst_video_info_set_format (&info, GST_VIDEO_FORMAT_I420, 176, 144);
+ GST_VIDEO_INFO_PAR_N (&info) = GST_VIDEO_INFO_PAR_D (&info) = 1;
+ GST_VIDEO_INFO_FPS_N (&info) = 25;
+ GST_VIDEO_INFO_FPS_D (&info) = 1;
+ GST_VIDEO_INFO_FPS_D (&info) = 1;
+ GST_VIDEO_INFO_CHROMA_SITE (&info) = GST_VIDEO_CHROMA_SITE_MPEG2;
+ gst_video_colorimetry_from_string (&GST_VIDEO_INFO_COLORIMETRY (&info),
+ GST_VIDEO_COLORIMETRY_BT601);
+ GST_VIDEO_INFO_MULTIVIEW_MODE (&info) = GST_VIDEO_MULTIVIEW_MODE_MONO;
+
+ out_caps = gst_video_info_to_caps (&info);
caps = gst_pad_get_current_caps (mysinkpad);
GST_LOG ("output caps %" GST_PTR_FORMAT, caps);
@@ -1825,6 +1832,7 @@
GstCaps *out_caps;
GstCaps *caps;
guint offset = 0;
+ GstVideoInfo info;
mpeg2dec = setup_mpeg2dec ();
@@ -1856,13 +1864,18 @@
fail_unless_equals_int (num_buffers, 30);
/* each buffer should have these caps */
- out_caps =
- gst_caps_new_simple ("video/x-raw", "format", G_TYPE_STRING, "I420",
- "width", G_TYPE_INT, 183, "height", G_TYPE_INT, 217,
- "pixel-aspect-ratio", GST_TYPE_FRACTION, 1, 1, "framerate",
- GST_TYPE_FRACTION, 25, 1, "interlace-mode", G_TYPE_STRING, "progressive",
- "chroma-site", G_TYPE_STRING, "mpeg2", "colorimetry", G_TYPE_STRING,
- "bt601", NULL);
+ gst_video_info_init (&info);
+ gst_video_info_set_format (&info, GST_VIDEO_FORMAT_I420, 183, 217);
+ GST_VIDEO_INFO_PAR_N (&info) = GST_VIDEO_INFO_PAR_D (&info) = 1;
+ GST_VIDEO_INFO_FPS_N (&info) = 25;
+ GST_VIDEO_INFO_FPS_D (&info) = 1;
+ GST_VIDEO_INFO_FPS_D (&info) = 1;
+ GST_VIDEO_INFO_CHROMA_SITE (&info) = GST_VIDEO_CHROMA_SITE_MPEG2;
+ gst_video_colorimetry_from_string (&GST_VIDEO_INFO_COLORIMETRY (&info),
+ GST_VIDEO_COLORIMETRY_BT601);
+ GST_VIDEO_INFO_MULTIVIEW_MODE (&info) = GST_VIDEO_MULTIVIEW_MODE_MONO;
+
+ out_caps = gst_video_info_to_caps (&info);
caps = gst_pad_get_current_caps (mysinkpad);
GST_LOG ("output caps %" GST_PTR_FORMAT, caps);
diff --git a/tests/check/elements/mpg123audiodec.c b/tests/check/elements/mpg123audiodec.c
deleted file mode 100644
index 20d6e77..0000000
--- a/tests/check/elements/mpg123audiodec.c
+++ /dev/null
@@ -1,534 +0,0 @@
-/* GStreamer
- *
- * unit test for mpg123audiodec
- *
- * Copyright (c) 2012 Carlos Rafael Giani <dv@pseudoterminal.org>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#include <unistd.h>
-
-#include <gst/check/gstcheck.h>
-#include <gst/audio/audio.h>
-
-#include <gst/fft/gstfft.h>
-#include <gst/fft/gstffts16.h>
-#include <gst/fft/gstffts32.h>
-#include <gst/fft/gstfftf32.h>
-#include <gst/fft/gstfftf64.h>
-
-#include <gst/app/gstappsink.h>
-
-/* For ease of programming we use globals to keep refs for our floating
- * src and sink pads we create; otherwise we always have to do get_pad,
- * get_peer, and then remove references in every test function */
-static GstPad *mysrcpad, *mysinkpad;
-
-
-#define MP2_STREAM_FILENAME "stream.mp2"
-#define MP3_CBR_STREAM_FILENAME "cbr_stream.mp3"
-#define MP3_VBR_STREAM_FILENAME "vbr_stream.mp3"
-
-
-/* mpeg 1 layer 2 stream created with:
- * gst-launch-1.0 -v audiotestsrc wave=sine freq=440 volume=1 num-buffers=32 ! \
- * "audio/x-raw, format=(string)S16LE, layout=(string)interleaved, rate=(int)44100, channels=(int)1" ! \
- * avenc_mp2 bitrate=32000 ! tee name=t \
- * t. ! queue ! fakesink silent=false \
- * t. ! queue ! filesink location=test.mp2
- *
- * mpeg 1 layer 3 CBR stream created with:
- * gst-launch-1.0 -v audiotestsrc wave=sine freq=440 volume=1 num-buffers=32 ! \
- * "audio/x-raw, format=(string)S16LE, layout=(string)interleaved, rate=(int)44100, channels=(int)1" ! \
- * lamemp3enc encoding-engine-quality=high cbr=true target=bitrate bitrate=32 ! \
- * "audio/mpeg, rate=(int)44100, channels=(int)1" ! tee name=t \
- * t. ! queue ! fakesink silent=false \
- * t. ! queue ! filesink location=test.mp3
- *
- * mpeg 1 layer 3 VBR stream created with:
- * gst-launch-1.0 -v audiotestsrc wave=sine freq=440 volume=1 num-buffers=32 ! \
- * "audio/x-raw, format=(string)S16LE, layout=(string)interleaved, rate=(int)44100, channels=(int)1" ! \
- * lamemp3enc encoding-engine-quality=high cbr=false target=quality quality=7 ! \
- * "audio/mpeg, rate=(int)44100, channels=(int)1" ! tee name=t \
- * t. ! queue ! fakesink silent=false \
- * t. ! queue ! filesink location=test.mp3
- */
-
-
-/* FFT test helpers taken from gst-plugins-base tests/check/audioresample.c */
-
-#define FFT_HELPERS(type,ffttag,ffttag2,scale) \
-static gdouble magnitude##ffttag (const GstFFT##ffttag##Complex *c) \
-{ \
- gdouble mag = (gdouble) c->r * (gdouble) c->r; \
- mag += (gdouble) c->i * (gdouble) c->i; \
- mag /= scale * scale; \
- mag = 10.0 * log10 (mag); \
- return mag; \
-} \
-static gdouble find_main_frequency_spot_##ffttag ( \
- const GstFFT##ffttag##Complex *v, int elements) \
-{ \
- int i; \
- gdouble maxmag = -9999; \
- int maxidx = 0; \
- for (i=0; i<elements; ++i) { \
- gdouble mag = magnitude##ffttag (v+i); \
- if (mag > maxmag) { \
- maxmag = mag; \
- maxidx = i; \
- } \
- } \
- return maxidx / (gdouble) elements; \
-} \
-static gboolean is_zero_except_##ffttag (const GstFFT##ffttag##Complex *v, \
- int elements, gdouble spot) \
-{ \
- int i; \
- for (i=0; i<elements; ++i) { \
- gdouble pos = i / (gdouble) elements; \
- gdouble mag = magnitude##ffttag (v+i); \
- if (fabs (pos - spot) > 0.01) { \
- if (mag > -35.0) { \
- GST_LOG("Found magnitude at %f : %f (peak at %f)\n", pos, mag, spot); \
- return FALSE; \
- } \
- } \
- } \
- return TRUE; \
-} \
-static void check_main_frequency_spot_##ffttag (GstBuffer *buffer, gdouble \
- expected_spot) \
-{ \
- GstMapInfo map; \
- int num_samples; \
- gdouble actual_spot; \
- GstFFT##ffttag *ctx; \
- GstFFT##ffttag##Complex *fftdata; \
- \
- gst_buffer_map (buffer, &map, GST_MAP_READ); \
- \
- num_samples = map.size / sizeof(type) & ~1; \
- ctx = gst_fft_##ffttag2##_new (num_samples, FALSE); \
- fftdata = g_new (GstFFT##ffttag##Complex, num_samples / 2 + 1); \
- \
- gst_fft_##ffttag2##_window (ctx, (type*)map.data, \
- GST_FFT_WINDOW_HAMMING); \
- gst_fft_##ffttag2##_fft (ctx, (type*)map.data, fftdata); \
- \
- actual_spot = find_main_frequency_spot_##ffttag (fftdata, \
- num_samples / 2 + 1); \
- GST_LOG ("Expected spot: %.3f actual: %.3f %f", expected_spot, actual_spot, \
- fabs (expected_spot - actual_spot)); \
- fail_unless (fabs (expected_spot - actual_spot) < 0.05, \
- "Actual main frequency spot is too far away from expected one"); \
- fail_unless (is_zero_except_##ffttag (fftdata, num_samples / 2 + 1, \
- actual_spot), "One secondary peak in spectrum exceeds threshold"); \
- \
- gst_buffer_unmap (buffer, &map); \
- \
- gst_fft_##ffttag2##_free (ctx); \
- g_free (fftdata); \
-}
-FFT_HELPERS (gint32, S32, s32, 2147483647.0);
-
-
-static GstStaticPadTemplate sinktemplate = GST_STATIC_PAD_TEMPLATE ("sink",
- GST_PAD_SINK,
- GST_PAD_ALWAYS,
- GST_STATIC_CAPS ("audio/x-raw, format = (string) " GST_AUDIO_NE (S32))
- );
-static GstStaticPadTemplate layer2_srctemplate = GST_STATIC_PAD_TEMPLATE ("src",
- GST_PAD_SRC,
- GST_PAD_ALWAYS,
- GST_STATIC_CAPS_ANY);
-static GstStaticPadTemplate layer3_srctemplate = GST_STATIC_PAD_TEMPLATE ("src",
- GST_PAD_SRC,
- GST_PAD_ALWAYS,
- GST_STATIC_CAPS_ANY);
-
-
-static void
-setup_input_pipeline (gchar const *stream_filename, GstElement ** pipeline,
- GstElement ** appsink)
-{
- GstElement *source, *parser;
-
- *pipeline = gst_pipeline_new (NULL);
- source = gst_element_factory_make ("filesrc", NULL);
- parser = gst_element_factory_make ("mpegaudioparse", NULL);
- *appsink = gst_element_factory_make ("appsink", NULL);
-
- gst_bin_add_many (GST_BIN (*pipeline), source, parser, *appsink, NULL);
- gst_element_link_many (source, parser, *appsink, NULL);
-
- {
- char *full_filename =
- g_build_filename (GST_TEST_FILES_PATH, stream_filename, NULL);
- g_object_set (G_OBJECT (source), "location", full_filename, NULL);
- g_free (full_filename);
- }
-
- gst_element_set_state (*pipeline, GST_STATE_PLAYING);
-}
-
-static void
-cleanup_input_pipeline (GstElement * pipeline)
-{
- gst_element_set_state (pipeline, GST_STATE_NULL);
- gst_object_unref (pipeline);
-}
-
-static GstElement *
-setup_mpeg1layer2dec (void)
-{
- GstElement *mpg123audiodec;
- GstCaps *caps;
-
- GST_DEBUG ("setup_mpeg1layer2dec");
- mpg123audiodec = gst_check_setup_element ("mpg123audiodec");
- mysrcpad = gst_check_setup_src_pad (mpg123audiodec, &layer2_srctemplate);
- mysinkpad = gst_check_setup_sink_pad (mpg123audiodec, &sinktemplate);
- gst_pad_set_active (mysrcpad, TRUE);
- gst_pad_set_active (mysinkpad, TRUE);
-
- /* This is necessary to trigger a set_format call in the decoder;
- * fixed caps don't trigger it */
- caps = gst_caps_new_simple ("audio/mpeg",
- "mpegversion", G_TYPE_INT, 1,
- "layer", G_TYPE_INT, 2,
- "rate", G_TYPE_INT, 44100,
- "channels", G_TYPE_INT, 1, "parsed", G_TYPE_BOOLEAN, TRUE, NULL);
- gst_check_setup_events (mysrcpad, mpg123audiodec, caps, GST_FORMAT_TIME);
- gst_caps_unref (caps);
-
- return mpg123audiodec;
-}
-
-static GstElement *
-setup_mpeg1layer3dec (void)
-{
- GstElement *mpg123audiodec;
- GstCaps *caps;
-
- GST_DEBUG ("setup_mpeg1layer3dec");
- mpg123audiodec = gst_check_setup_element ("mpg123audiodec");
- mysrcpad = gst_check_setup_src_pad (mpg123audiodec, &layer3_srctemplate);
- mysinkpad = gst_check_setup_sink_pad (mpg123audiodec, &sinktemplate);
- gst_pad_set_active (mysrcpad, TRUE);
- gst_pad_set_active (mysinkpad, TRUE);
-
- /* This is necessary to trigger a set_format call in the decoder;
- * fixed caps don't trigger it */
- caps = gst_caps_new_simple ("audio/mpeg",
- "mpegversion", G_TYPE_INT, 1,
- "layer", G_TYPE_INT, 3,
- "rate", G_TYPE_INT, 44100,
- "channels", G_TYPE_INT, 1, "parsed", G_TYPE_BOOLEAN, TRUE, NULL);
- gst_check_setup_events (mysrcpad, mpg123audiodec, caps, GST_FORMAT_TIME);
- gst_caps_unref (caps);
-
- return mpg123audiodec;
-}
-
-static void
-cleanup_mpg123audiodec (GstElement * mpg123audiodec)
-{
- GST_DEBUG ("cleanup_mpeg1layer2dec");
- gst_element_set_state (mpg123audiodec, GST_STATE_NULL);
-
- gst_pad_set_active (mysrcpad, FALSE);
- gst_pad_set_active (mysinkpad, FALSE);
- gst_check_teardown_src_pad (mpg123audiodec);
- gst_check_teardown_sink_pad (mpg123audiodec);
- gst_check_teardown_element (mpg123audiodec);
-}
-
-static void
-run_decoding_test (GstElement * mpg123audiodec, gchar const *filename)
-{
- GstBus *bus;
- unsigned int num_input_buffers, num_decoded_buffers;
- gint expected_size;
- GstCaps *out_caps, *caps;
- GstAudioInfo audioinfo;
- GstElement *input_pipeline, *input_appsink;
- int i;
- GstBuffer *outbuffer;
-
- /* 440 Hz = frequency of sine wave in audio data
- * 44100 Hz = sample rate
- * (44100 / 2) Hz = Nyquist frequency */
- static double const expected_frequency_spot = 440.0 / (44100.0 / 2.0);
-
- fail_unless (gst_element_set_state (mpg123audiodec,
- GST_STATE_PLAYING) == GST_STATE_CHANGE_SUCCESS,
- "could not set to playing");
- bus = gst_bus_new ();
-
- gst_element_set_bus (mpg123audiodec, bus);
-
- setup_input_pipeline (filename, &input_pipeline, &input_appsink);
-
- num_input_buffers = 0;
- while (TRUE) {
- GstSample *sample;
- GstBuffer *input_buffer;
-
- sample = gst_app_sink_pull_sample (GST_APP_SINK (input_appsink));
- if (sample == NULL)
- break;
-
- fail_unless (GST_IS_SAMPLE (sample));
-
- input_buffer = gst_sample_get_buffer (sample);
- fail_if (input_buffer == NULL);
-
- /* This is done to be on the safe side - docs say lifetime of the input buffer
- * depends *solely* on the sample */
- input_buffer = gst_buffer_copy (input_buffer);
-
- fail_unless_equals_int (gst_pad_push (mysrcpad, input_buffer), GST_FLOW_OK);
-
- ++num_input_buffers;
-
- gst_sample_unref (sample);
- }
-
- num_decoded_buffers = g_list_length (buffers);
-
- /* check number of decoded buffers */
- fail_unless_equals_int (num_decoded_buffers, num_input_buffers - 2);
-
- caps = gst_pad_get_current_caps (mysinkpad);
- GST_LOG ("output caps %" GST_PTR_FORMAT, caps);
- fail_unless (gst_audio_info_from_caps (&audioinfo, caps),
- "Getting audio info from caps failed");
-
- /* check caps */
- out_caps = gst_caps_new_simple ("audio/x-raw",
- "format", G_TYPE_STRING, GST_AUDIO_NE (S32),
- "layout", G_TYPE_STRING, "interleaved",
- "rate", G_TYPE_INT, 44100, "channels", G_TYPE_INT, 1, NULL);
-
- fail_unless (gst_caps_is_equal_fixed (caps, out_caps), "Incorrect out caps");
-
- gst_caps_unref (out_caps);
- gst_caps_unref (caps);
-
- /* here, test if decoded data is a sine tone, and if the sine frequency is at the
- * right spot in the spectrum */
- for (i = 0; i < num_decoded_buffers; ++i) {
- outbuffer = GST_BUFFER (buffers->data);
- fail_if (outbuffer == NULL, "Invalid buffer retrieved");
-
- /* MPEG 1 layer 2 uses 1152 samples per frame */
- expected_size = 1152 * GST_AUDIO_INFO_BPF (&audioinfo);
- fail_unless_equals_int (gst_buffer_get_size (outbuffer), expected_size);
-
- check_main_frequency_spot_S32 (outbuffer, expected_frequency_spot);
-
- buffers = g_list_remove (buffers, outbuffer);
- gst_buffer_unref (outbuffer);
- outbuffer = NULL;
- }
-
- g_list_free (buffers);
- buffers = NULL;
-
- cleanup_input_pipeline (input_pipeline);
- gst_bus_set_flushing (bus, TRUE);
- gst_element_set_bus (mpg123audiodec, NULL);
- gst_object_unref (GST_OBJECT (bus));
-}
-
-
-GST_START_TEST (test_decode_mpeg1layer2)
-{
- GstElement *mpg123audiodec;
- mpg123audiodec = setup_mpeg1layer2dec ();
- run_decoding_test (mpg123audiodec, MP2_STREAM_FILENAME);
- cleanup_mpg123audiodec (mpg123audiodec);
- mpg123audiodec = NULL;
-}
-
-GST_END_TEST;
-
-
-GST_START_TEST (test_decode_mpeg1layer3_cbr)
-{
- GstElement *mpg123audiodec;
- mpg123audiodec = setup_mpeg1layer3dec ();
- run_decoding_test (mpg123audiodec, MP3_CBR_STREAM_FILENAME);
- cleanup_mpg123audiodec (mpg123audiodec);
-}
-
-GST_END_TEST;
-
-
-GST_START_TEST (test_decode_mpeg1layer3_vbr)
-{
- GstElement *mpg123audiodec;
- mpg123audiodec = setup_mpeg1layer3dec ();
- run_decoding_test (mpg123audiodec, MP3_VBR_STREAM_FILENAME);
- cleanup_mpg123audiodec (mpg123audiodec);
-}
-
-GST_END_TEST;
-
-
-GST_START_TEST (test_decode_garbage_mpeg1layer2)
-{
- GstElement *mpg123audiodec;
- GstBuffer *inbuffer;
- GstBus *bus;
- int i, num_buffers;
- guint32 *tmpbuf;
-
- mpg123audiodec = setup_mpeg1layer2dec ();
-
- fail_unless (gst_element_set_state (mpg123audiodec,
- GST_STATE_PLAYING) == GST_STATE_CHANGE_SUCCESS,
- "could not set to playing");
- bus = gst_bus_new ();
-
- /* initialize the buffer with something that is no mpeg2 */
- tmpbuf = g_new (guint32, 4096);
- for (i = 0; i < 4096; i++) {
- tmpbuf[i] = i;
- }
- inbuffer = gst_buffer_new_wrapped (tmpbuf, 4096 * sizeof (guint32));
-
- ASSERT_BUFFER_REFCOUNT (inbuffer, "inbuffer", 1);
-
- gst_element_set_bus (mpg123audiodec, bus);
-
- /* should be possible to push without problems but nothing gets decoded */
- fail_unless_equals_int (gst_pad_push (mysrcpad, inbuffer), GST_FLOW_OK);
-
- num_buffers = g_list_length (buffers);
-
- /* should be 0 buffers as decoding should've been impossible */
- fail_unless_equals_int (num_buffers, 0);
-
- g_list_free (buffers);
- buffers = NULL;
-
- gst_bus_set_flushing (bus, TRUE);
- gst_element_set_bus (mpg123audiodec, NULL);
- gst_object_unref (GST_OBJECT (bus));
- cleanup_mpg123audiodec (mpg123audiodec);
- mpg123audiodec = NULL;
-}
-
-GST_END_TEST;
-
-
-GST_START_TEST (test_decode_garbage_mpeg1layer3)
-{
- GstElement *mpg123audiodec;
- GstBuffer *inbuffer;
- GstBus *bus;
- int i, num_buffers;
- guint32 *tmpbuf;
-
- mpg123audiodec = setup_mpeg1layer3dec ();
-
- fail_unless (gst_element_set_state (mpg123audiodec,
- GST_STATE_PLAYING) == GST_STATE_CHANGE_SUCCESS,
- "could not set to playing");
- bus = gst_bus_new ();
-
- /* initialize the buffer with something that is no mpeg2 */
- tmpbuf = g_new (guint32, 4096);
- for (i = 0; i < 4096; i++) {
- tmpbuf[i] = i;
- }
- inbuffer = gst_buffer_new_wrapped (tmpbuf, 4096 * sizeof (guint32));
-
- ASSERT_BUFFER_REFCOUNT (inbuffer, "inbuffer", 1);
-
- gst_element_set_bus (mpg123audiodec, bus);
-
- /* should be possible to push without problems but nothing gets decoded */
- fail_unless_equals_int (gst_pad_push (mysrcpad, inbuffer), GST_FLOW_OK);
-
- num_buffers = g_list_length (buffers);
-
- /* should be 0 buffers as decoding should've been impossible */
- fail_unless_equals_int (num_buffers, 0);
-
- g_list_free (buffers);
- buffers = NULL;
-
- gst_bus_set_flushing (bus, TRUE);
- gst_element_set_bus (mpg123audiodec, NULL);
- gst_object_unref (GST_OBJECT (bus));
- cleanup_mpg123audiodec (mpg123audiodec);
- mpg123audiodec = NULL;
-}
-
-GST_END_TEST;
-
-
-static gboolean
-is_test_file_available (gchar const *filename)
-{
- gboolean ret;
- gchar *full_filename;
- gchar *cwd;
-
- cwd = g_get_current_dir ();
- full_filename = g_build_filename (cwd, GST_TEST_FILES_PATH, filename, NULL);
- ret =
- g_file_test (full_filename, G_FILE_TEST_IS_REGULAR | G_FILE_TEST_EXISTS);
- g_free (full_filename);
- g_free (cwd);
- return ret;
-}
-
-static Suite *
-mpg123audiodec_suite (void)
-{
- GstRegistry *registry;
- Suite *s = suite_create ("mpg123audiodec");
- TCase *tc_chain = tcase_create ("general");
-
- registry = gst_registry_get ();
-
- suite_add_tcase (s, tc_chain);
- if (gst_registry_check_feature_version (registry, "filesrc",
- GST_VERSION_MAJOR, GST_VERSION_MINOR, 0) &&
- gst_registry_check_feature_version (registry, "mpegaudioparse",
- GST_VERSION_MAJOR, GST_VERSION_MINOR, 0) &&
- gst_registry_check_feature_version (registry, "appsrc",
- GST_VERSION_MAJOR, GST_VERSION_MINOR, 0)) {
- if (is_test_file_available (MP2_STREAM_FILENAME))
- tcase_add_test (tc_chain, test_decode_mpeg1layer2);
- if (is_test_file_available (MP3_CBR_STREAM_FILENAME))
- tcase_add_test (tc_chain, test_decode_mpeg1layer3_cbr);
- if (is_test_file_available (MP3_VBR_STREAM_FILENAME))
- tcase_add_test (tc_chain, test_decode_mpeg1layer3_vbr);
- }
- tcase_add_test (tc_chain, test_decode_garbage_mpeg1layer2);
- tcase_add_test (tc_chain, test_decode_garbage_mpeg1layer3);
-
- return s;
-}
-
-
-GST_CHECK_MAIN (mpg123audiodec)
diff --git a/tests/check/gst-plugins-ugly.supp b/tests/check/gst-plugins-ugly.supp
index 8e0cfa8..d73d186 100644
--- a/tests/check/gst-plugins-ugly.supp
+++ b/tests/check/gst-plugins-ugly.supp
@@ -188,16 +188,3 @@
fun:Speech_Encode_Frame
fun:Encoder_Interface_Encode
}
-
-## lame
-
-{
- <lame Conditional jump or move depends on uninitialised values>
- Memcheck:Cond
- fun:L3psycho_anal_vbr
- fun:lame_encode_mp3_frame
- ...
- fun:lame_encode_flush
- fun:gst_lamemp3enc_sink_event
-}
-
diff --git a/tests/check/meson.build b/tests/check/meson.build
index f420303..6fdb490 100644
--- a/tests/check/meson.build
+++ b/tests/check/meson.build
@@ -1,12 +1,10 @@
# name, condition when to skip the test and extra dependencies
ugly_tests = [
[ 'elements/amrnbenc', not amrnb_dep.found() ],
- [ 'elements/mpeg2dec', not mpeg2_dep.found() ],
- [ 'elements/mpg123audiodec', not mpg123_dep.found() ],
+ [ 'elements/mpeg2dec', not mpeg2_dep.found(), [ gstvideo_dep ] ],
[ 'elements/x264enc', not x264_dep.found() ],
[ 'elements/xingmux' ],
[ 'generic/states' ],
- [ 'pipelines/lame', not lame_dep.found() ],
]
test_defines = [
@@ -31,7 +29,8 @@
# FIXME: valgrind_args: add suppressions $(top_srcdir)/common/gst.supp $(srcdir)/gst-plugins-ugly.supp
foreach t : ugly_tests
- test_name = t.get(0)
+ fname = '@0@.c'.format(t.get(0))
+ test_name = t.get(0).underscorify()
extra_deps = [ ]
if t.length() == 3
extra_deps = t.get(2)
@@ -42,7 +41,7 @@
skip_test = false
endif
if not skip_test
- exe = executable(test_name, '@0@.c'.format(test_name),
+ exe = executable(test_name, fname,
include_directories : [configinc],
c_args : ['-DHAVE_CONFIG_H=1' ] + test_defines,
dependencies : [libm] + test_deps + extra_deps,
diff --git a/tests/check/pipelines/lame.c b/tests/check/pipelines/lame.c
deleted file mode 100644
index a69f58a..0000000
--- a/tests/check/pipelines/lame.c
+++ /dev/null
@@ -1,127 +0,0 @@
-/* GStreamer
- *
- * unit test for lame
- *
- * Copyright (C) 2007 Thomas Vander Stichele <thomas at apestaart dot org>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#include <gst/check/gstcheck.h>
-#include <gst/check/gstbufferstraw.h>
-
-#ifndef GST_DISABLE_PARSE
-
-GST_START_TEST (test_format)
-{
- GstElement *bin;
- GstPad *pad;
- gchar *pipe_str;
- GstBuffer *buffer;
- GError *error = NULL;
-
- pipe_str = g_strdup_printf ("audiotestsrc num-buffers=1 "
- "! audio/x-raw, rate=22050, channels=1 "
- "! lamemp3enc bitrate=24 ! audio/mpeg,rate=22050 ! fakesink");
-
- bin = gst_parse_launch (pipe_str, &error);
- fail_unless (bin != NULL, "Error parsing pipeline: %s",
- error ? error->message : "(invalid error)");
- g_free (pipe_str);
-
- /* get the pad */
- {
- GstElement *sink = gst_bin_get_by_name (GST_BIN (bin), "fakesink0");
-
- fail_unless (sink != NULL, "Could not get fakesink out of bin");
- pad = gst_element_get_static_pad (sink, "sink");
- fail_unless (pad != NULL, "Could not get pad out of fakesink");
- gst_object_unref (sink);
- }
-
- gst_buffer_straw_start_pipeline (bin, pad);
-
- buffer = gst_buffer_straw_get_buffer (bin, pad);
-
- gst_buffer_straw_stop_pipeline (bin, pad);
-
- gst_buffer_unref (buffer);
- gst_object_unref (pad);
- gst_object_unref (bin);
-}
-
-GST_END_TEST;
-
-GST_START_TEST (test_caps_proxy)
-{
- GstElement *bin;
- GstPad *pad;
- gchar *pipe_str;
- GstBuffer *buffer;
- GError *error = NULL;
-
- pipe_str = g_strdup_printf ("audiotestsrc num-buffers=1 "
- "! audio/x-raw,rate=48000,channels=1 "
- "! audioresample "
- "! lamemp3enc ! audio/mpeg,rate=(int){22050,44100} ! fakesink");
-
- bin = gst_parse_launch (pipe_str, &error);
- fail_unless (bin != NULL, "Error parsing pipeline: %s",
- error ? error->message : "(invalid error)");
- g_free (pipe_str);
-
- /* get the pad */
- {
- GstElement *sink = gst_bin_get_by_name (GST_BIN (bin), "fakesink0");
-
- fail_unless (sink != NULL, "Could not get fakesink out of bin");
- pad = gst_element_get_static_pad (sink, "sink");
- fail_unless (pad != NULL, "Could not get pad out of fakesink");
- gst_object_unref (sink);
- }
-
- gst_buffer_straw_start_pipeline (bin, pad);
-
- buffer = gst_buffer_straw_get_buffer (bin, pad);
-
- gst_buffer_straw_stop_pipeline (bin, pad);
-
- gst_buffer_unref (buffer);
- gst_object_unref (pad);
- gst_object_unref (bin);
-}
-
-GST_END_TEST;
-
-#endif /* #ifndef GST_DISABLE_PARSE */
-
-Suite *
-lame_suite (void)
-{
- Suite *s = suite_create ("lame");
- TCase *tc_chain = tcase_create ("general");
-
- suite_add_tcase (s, tc_chain);
-
-#ifndef GST_DISABLE_PARSE
- tcase_add_test (tc_chain, test_format);
- tcase_add_test (tc_chain, test_caps_proxy);
-#endif
-
- return s;
-}
-
-GST_CHECK_MAIN (lame);
diff --git a/tests/files/Makefile.am b/tests/files/Makefile.am
index dc0ab79..1b336ac 100644
--- a/tests/files/Makefile.am
+++ b/tests/files/Makefile.am
@@ -1,4 +1 @@
-EXTRA_DIST = \
- cbr_stream.mp3 \
- stream.mp2 \
- vbr_stream.mp3
+EXTRA_DIST =
diff --git a/tests/files/Makefile.in b/tests/files/Makefile.in
index 8c376e8..6890217 100644
--- a/tests/files/Makefile.in
+++ b/tests/files/Makefile.in
@@ -198,6 +198,7 @@
ERROR_CFLAGS = @ERROR_CFLAGS@
ERROR_CXXFLAGS = @ERROR_CXXFLAGS@
EXEEXT = @EXEEXT@
+EXTRA_CFLAGS = @EXTRA_CFLAGS@
FFLAGS = @FFLAGS@
FGREP = @FGREP@
GCOV = @GCOV@
@@ -249,7 +250,6 @@
GST_PLUGINS_NONPORTED = @GST_PLUGINS_NONPORTED@
GST_PLUGINS_SELECTED = @GST_PLUGINS_SELECTED@
GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
-GST_PLUGIN_LIBTOOLFLAGS = @GST_PLUGIN_LIBTOOLFLAGS@
GST_PREFIX = @GST_PREFIX@
GST_REVISION = @GST_REVISION@
GST_TOOLS_DIR = @GST_TOOLS_DIR@
@@ -260,7 +260,6 @@
GTKDOC_REBASE = @GTKDOC_REBASE@
HAVE_CXX = @HAVE_CXX@
HAVE_DVDREAD = @HAVE_DVDREAD@
-HAVE_LAME = @HAVE_LAME@
HTML_DIR = @HTML_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
@@ -269,8 +268,6 @@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INTLLIBS = @INTLLIBS@
INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-LAME_CFLAGS = @LAME_CFLAGS@
-LAME_LIBS = @LAME_LIBS@
LD = @LD@
LDFLAGS = @LDFLAGS@
LIBICONV = @LIBICONV@
@@ -292,8 +289,6 @@
MKDIR_P = @MKDIR_P@
MPEG2DEC_CFLAGS = @MPEG2DEC_CFLAGS@
MPEG2DEC_LIBS = @MPEG2DEC_LIBS@
-MPG123_CFLAGS = @MPG123_CFLAGS@
-MPG123_LIBS = @MPG123_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_015 = @MSGFMT_015@
MSGMERGE = @MSGMERGE@
@@ -336,13 +331,13 @@
SIDPLAY_CFLAGS = @SIDPLAY_CFLAGS@
SIDPLAY_LIBS = @SIDPLAY_LIBS@
STRIP = @STRIP@
-TWOLAME_CFLAGS = @TWOLAME_CFLAGS@
-TWOLAME_LIBS = @TWOLAME_LIBS@
USE_NLS = @USE_NLS@
VALGRIND_CFLAGS = @VALGRIND_CFLAGS@
VALGRIND_LIBS = @VALGRIND_LIBS@
VALGRIND_PATH = @VALGRIND_PATH@
VERSION = @VERSION@
+VISIBILITY_CFLAGS = @VISIBILITY_CFLAGS@
+VISIBILITY_CXXFLAGS = @VISIBILITY_CXXFLAGS@
WARNING_CFLAGS = @WARNING_CFLAGS@
WARNING_CXXFLAGS = @WARNING_CXXFLAGS@
WIN32_LIBS = @WIN32_LIBS@
@@ -414,11 +409,7 @@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-EXTRA_DIST = \
- cbr_stream.mp3 \
- stream.mp2 \
- vbr_stream.mp3
-
+EXTRA_DIST =
all: all-am
.SUFFIXES:
diff --git a/tests/files/cbr_stream.mp3 b/tests/files/cbr_stream.mp3
deleted file mode 100644
index b1a5c43..0000000
--- a/tests/files/cbr_stream.mp3
+++ /dev/null
Binary files differ
diff --git a/tests/files/stream.mp2 b/tests/files/stream.mp2
deleted file mode 100644
index ab6e900..0000000
--- a/tests/files/stream.mp2
+++ /dev/null
Binary files differ
diff --git a/tests/files/vbr_stream.mp3 b/tests/files/vbr_stream.mp3
deleted file mode 100644
index 81fc38b..0000000
--- a/tests/files/vbr_stream.mp3
+++ /dev/null
Binary files differ
