aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog78
-rw-r--r--Makefile.in2
-rw-r--r--NEWS2
-rw-r--r--aclocal.m41
-rw-r--r--common/Makefile.in2
-rw-r--r--common/m4/Makefile.in2
-rwxr-xr-xconfigure105
-rw-r--r--configure.ac25
-rw-r--r--docs/Makefile.in2
-rw-r--r--ext/Makefile.in2
-rw-r--r--ext/libav/Makefile.in21
-rw-r--r--ext/libav/gstavcodecmap.c14
-rw-r--r--ext/libav/gstavdemux.c2
-rw-r--r--ext/libav/gstavmux.c2
-rw-r--r--ext/libav/gstavviddec.c10
-rw-r--r--ext/libav/gstavvidenc.c26
-rw-r--r--ext/libswscale/Makefile.in21
-rw-r--r--gst-libav.doap10
-rw-r--r--gst-libav.spec2
-rw-r--r--gst-libs/Makefile.in2
-rw-r--r--gst-libs/ext/Makefile.in2
-rw-r--r--pkgconfig/Makefile.in2
-rw-r--r--tests/Makefile.in2
-rw-r--r--tests/check/Makefile.in118
-rw-r--r--tests/check/elements/avdemux_ape.c2
-rw-r--r--tests/files/Makefile.in2
26 files changed, 236 insertions, 223 deletions
diff --git a/ChangeLog b/ChangeLog
index 7463c62..3b92a20 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,83 @@
+=== release 1.1.4 ===
+
+2013-08-28 Sebastian Dröge <sebastian.droege@collabora.co.uk>
+
+ * configure.ac:
+ releasing 1.1.4
+
+2013-08-28 12:09:33 +0200 Sebastian Dröge <slomo@circular-chaos.org>
+
+ * configure.ac:
+ configure.ac: Fix typo
+
+2013-08-23 09:58:30 +0200 Sebastian Dröge <slomo@circular-chaos.org>
+
+ * configure.ac:
+ configure: Disable build of dxva2 and vdpau support explicitely
+ It is enabled although we pass --disable-hwaccels apparently and
+ makes the build fail on Windows because libav looks for the d3d headers
+ in the wrong places. We can't make use of these features via libav.
+ https://bugzilla.gnome.org/show_bug.cgi?id=706601
+
+2013-08-22 14:56:11 +0200 Sebastian Dröge <slomo@circular-chaos.org>
+
+ * configure.ac:
+ configure: Fix bz2 configure check for Windows
+ Due to function decorations on Windows AC_CHECK_LIB can't be used to check for bz2.
+ https://bugzilla.gnome.org/show_bug.cgi?id=465924
+
+2013-08-22 14:23:12 +0200 Sebastian Dröge <slomo@circular-chaos.org>
+
+ * ext/libav/gstavcodecmap.c:
+ * ext/libav/gstavdemux.c:
+ avdemux: Add support for video/x-pva
+ https://bugzilla.gnome.org/show_bug.cgi?id=158719
+
+2013-08-21 13:40:03 +0100 Tim-Philipp Müller <tim@centricular.net>
+
+ * ext/libav/gstavvidenc.c:
+ avvidenc: propagate flow return values upstream in finish()
+
+2013-08-20 15:58:35 +0200 Sebastian Dröge <slomo@circular-chaos.org>
+
+ * tests/check/elements/avdemux_ape.c:
+ tests: Enable avdemux_ape test again, it works now
+ https://bugzilla.gnome.org/show_bug.cgi?id=684684
+
+2013-08-15 15:51:52 +0200 Sebastian Dröge <slomo@circular-chaos.org>
+
+ * ext/libav/gstavviddec.c:
+ * ext/libav/gstavvidenc.c:
+ libav: Use new flush vfunc of video codec base classes and remove reset implementations
+
+2013-08-13 12:49:26 +0200 Hans de Goede <hdegoede@redhat.com>
+
+ * ext/libav/gstavmux.c:
+ avmux: Don't fail on commas in the libav muxer type names
+ https://bugzilla.gnome.org/show_bug.cgi?id=697512
+
+2013-08-02 14:18:25 +0200 Lubosz Sarnecki <lubosz@gmail.com>
+
+ * configure.ac:
+ build: add subdir-objects to AM_INIT_AUTOMAKE
+ Fixes warnings with automake 1.14
+ https://bugzilla.gnome.org/show_bug.cgi?id=705350
+
+2013-07-29 14:48:40 +0200 Sebastian Dröge <slomo@circular-chaos.org>
+
+ * configure.ac:
+ Back to development
+
=== release 1.1.3 ===
-2013-07-29 Sebastian Dröge <sebastian.droege@collabora.co.uk>
+2013-07-29 13:59:50 +0200 Sebastian Dröge <slomo@circular-chaos.org>
+ * ChangeLog:
+ * NEWS:
+ * RELEASE:
* configure.ac:
- releasing 1.1.3
+ * gst-libav.doap:
+ Release 1.1.3
2013-07-29 12:19:22 +0200 Sebastian Dröge <slomo@circular-chaos.org>
diff --git a/Makefile.in b/Makefile.in
index 0d78704..4024b1e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -111,7 +111,6 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \
$(top_srcdir)/common/m4/gst-check.m4 \
$(top_srcdir)/common/m4/gst-doc.m4 \
$(top_srcdir)/common/m4/gst-error.m4 \
- $(top_srcdir)/common/m4/gst-feature.m4 \
$(top_srcdir)/common/m4/gst-platform.m4 \
$(top_srcdir)/common/m4/gst-plugin-docs.m4 \
$(top_srcdir)/common/m4/gst-plugindir.m4 \
@@ -297,7 +296,6 @@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
GTKDOC_MKPDF = @GTKDOC_MKPDF@
GTKDOC_REBASE = @GTKDOC_REBASE@
-HAVE_BZ2 = @HAVE_BZ2@
HAVE_DOCBOOK2PS = @HAVE_DOCBOOK2PS@
HAVE_DVIPS = @HAVE_DVIPS@
HAVE_EPSTOPDF = @HAVE_EPSTOPDF@
diff --git a/NEWS b/NEWS
index 92654ad..2bd67ee 100644
--- a/NEWS
+++ b/NEWS
@@ -1,2 +1,2 @@
-This is GStreamer Libav Plugins 1.1.3
+This is GStreamer Libav Plugins 1.1.4
diff --git a/aclocal.m4 b/aclocal.m4
index e0d0d09..36437e0 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1369,7 +1369,6 @@ m4_include([common/m4/gst-args.m4])
m4_include([common/m4/gst-check.m4])
m4_include([common/m4/gst-doc.m4])
m4_include([common/m4/gst-error.m4])
-m4_include([common/m4/gst-feature.m4])
m4_include([common/m4/gst-platform.m4])
m4_include([common/m4/gst-plugin-docs.m4])
m4_include([common/m4/gst-plugindir.m4])
diff --git a/common/Makefile.in b/common/Makefile.in
index a6545f7..73de888 100644
--- a/common/Makefile.in
+++ b/common/Makefile.in
@@ -94,7 +94,6 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \
$(top_srcdir)/common/m4/gst-check.m4 \
$(top_srcdir)/common/m4/gst-doc.m4 \
$(top_srcdir)/common/m4/gst-error.m4 \
- $(top_srcdir)/common/m4/gst-feature.m4 \
$(top_srcdir)/common/m4/gst-platform.m4 \
$(top_srcdir)/common/m4/gst-plugin-docs.m4 \
$(top_srcdir)/common/m4/gst-plugindir.m4 \
@@ -261,7 +260,6 @@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
GTKDOC_MKPDF = @GTKDOC_MKPDF@
GTKDOC_REBASE = @GTKDOC_REBASE@
-HAVE_BZ2 = @HAVE_BZ2@
HAVE_DOCBOOK2PS = @HAVE_DOCBOOK2PS@
HAVE_DVIPS = @HAVE_DVIPS@
HAVE_EPSTOPDF = @HAVE_EPSTOPDF@
diff --git a/common/m4/Makefile.in b/common/m4/Makefile.in
index 1a65916..7523c72 100644
--- a/common/m4/Makefile.in
+++ b/common/m4/Makefile.in
@@ -93,7 +93,6 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \
$(top_srcdir)/common/m4/gst-check.m4 \
$(top_srcdir)/common/m4/gst-doc.m4 \
$(top_srcdir)/common/m4/gst-error.m4 \
- $(top_srcdir)/common/m4/gst-feature.m4 \
$(top_srcdir)/common/m4/gst-platform.m4 \
$(top_srcdir)/common/m4/gst-plugin-docs.m4 \
$(top_srcdir)/common/m4/gst-plugindir.m4 \
@@ -200,7 +199,6 @@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
GTKDOC_MKPDF = @GTKDOC_MKPDF@
GTKDOC_REBASE = @GTKDOC_REBASE@
-HAVE_BZ2 = @HAVE_BZ2@
HAVE_DOCBOOK2PS = @HAVE_DOCBOOK2PS@
HAVE_DVIPS = @HAVE_DVIPS@
HAVE_EPSTOPDF = @HAVE_EPSTOPDF@
diff --git a/configure b/configure
index b927d30..f5211d1 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 libav 1.1.3.
+# Generated by GNU Autoconf 2.69 for GStreamer libav 1.1.4.
#
# Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer>.
#
@@ -591,8 +591,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='GStreamer libav'
PACKAGE_TARNAME='gst-libav'
-PACKAGE_VERSION='1.1.3'
-PACKAGE_STRING='GStreamer libav 1.1.3'
+PACKAGE_VERSION='1.1.4'
+PACKAGE_STRING='GStreamer libav 1.1.4'
PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer'
PACKAGE_URL=''
@@ -655,7 +655,6 @@ GST_LIBAV_ENABLE_LGPL_FALSE
GST_LIBAV_ENABLE_LGPL_TRUE
HAVE_BZ2_FALSE
HAVE_BZ2_TRUE
-HAVE_BZ2
DARWIN_LDFLAGS
GST_PLUGIN_LDFLAGS
GST_ALL_LDFLAGS
@@ -1520,7 +1519,7 @@ if test "$ac_init_help" = "long"; then
# 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 libav 1.1.3 to adapt to many kinds of systems.
+\`configure' configures GStreamer libav 1.1.4 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1591,7 +1590,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of GStreamer libav 1.1.3:";;
+ short | recursive ) echo "Configuration of GStreamer libav 1.1.4:";;
esac
cat <<\_ACEOF
@@ -1760,7 +1759,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-GStreamer libav configure 1.1.3
+GStreamer libav configure 1.1.4
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2175,7 +2174,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by GStreamer libav $as_me 1.1.3, which was
+It was created by GStreamer libav $as_me 1.1.4, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -3153,7 +3152,7 @@ fi
# Define the identity of the package.
PACKAGE='gst-libav'
- VERSION='1.1.3'
+ VERSION='1.1.4'
cat >>confdefs.h <<_ACEOF
@@ -3322,9 +3321,9 @@ $as_echo "$am_cv_prog_tar_ustar" >&6; }
- PACKAGE_VERSION_MAJOR=$(echo 1.1.3 | cut -d'.' -f1)
- PACKAGE_VERSION_MINOR=$(echo 1.1.3 | cut -d'.' -f2)
- PACKAGE_VERSION_MICRO=$(echo 1.1.3 | cut -d'.' -f3)
+ PACKAGE_VERSION_MAJOR=$(echo 1.1.4 | cut -d'.' -f1)
+ PACKAGE_VERSION_MINOR=$(echo 1.1.4 | cut -d'.' -f2)
+ PACKAGE_VERSION_MICRO=$(echo 1.1.4 | cut -d'.' -f3)
@@ -3335,7 +3334,7 @@ $as_echo "$am_cv_prog_tar_ustar" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking nano version" >&5
$as_echo_n "checking nano version... " >&6; }
- NANO=$(echo 1.1.3 | cut -d'.' -f4)
+ NANO=$(echo 1.1.4 | cut -d'.' -f4)
if test x"$NANO" = x || test "x$NANO" = "x0" ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: 0 (release)" >&5
@@ -7922,10 +7921,10 @@ fi
done
- GST_CURRENT=103
+ GST_CURRENT=104
GST_REVISION=0
- GST_AGE=103
- GST_LIBVERSION=103:0:103
+ GST_AGE=104
+ GST_LIBVERSION=104:0:104
@@ -12250,8 +12249,8 @@ CC="$lt_save_CC"
-GST_REQ=1.1.3
-GST_PBREQ=1.1.3
+GST_REQ=1.1.4
+GST_PBREQ=1.1.4
ORC_REQ=0.4.16
@@ -17040,70 +17039,32 @@ case $host_os in
esac
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for BZ2_bzlibVersion in -lbz2" >&5
+save_LIBS=$LIBS
+LIBS="$LIBS -lbz2"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BZ2_bzlibVersion in -lbz2" >&5
$as_echo_n "checking for BZ2_bzlibVersion in -lbz2... " >&6; }
-if ${ac_cv_lib_bz2_BZ2_bzlibVersion+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lbz2 $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 BZ2_bzlibVersion ();
+#include <bzlib.h>
int
main ()
{
-return BZ2_bzlibVersion ();
+const char *version = BZ2_bzlibVersion ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_bz2_BZ2_bzlibVersion=yes
-else
- ac_cv_lib_bz2_BZ2_bzlibVersion=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_bz2_BZ2_bzlibVersion" >&5
-$as_echo "$ac_cv_lib_bz2_BZ2_bzlibVersion" >&6; }
-if test "x$ac_cv_lib_bz2_BZ2_bzlibVersion" = xyes; then :
HAVE_BZ2=yes
else
HAVE_BZ2=no
fi
-
- if test "x$HAVE_BZ2" = "xyes"; then
- ac_fn_c_check_header_mongrel "$LINENO" "bzlib.h" "ac_cv_header_bzlib_h" "$ac_includes_default"
-if test "x$ac_cv_header_bzlib_h" = xyes; then :
- :
-else
- HAVE_BZ2=no
-fi
-
-
- if test "x$HAVE_BZ2" = "xyes"; then
- have_bz2=yes
- else
- have_bz2=no
- fi
- else
- have_bz2=no
- fi
-
-
-
- if test "x$have_bz2" = "xyes"; then
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $HAVE_BZ2" >&5
+$as_echo "$HAVE_BZ2" >&6; }
+LIBS=$save_LIBS
+ if test "x$HAVE_BZ2" = "xyes"; then
HAVE_BZ2_TRUE=
HAVE_BZ2_FALSE='#'
else
@@ -17111,7 +17072,7 @@ else
HAVE_BZ2_FALSE=
fi
-if test "x$have_bz2" = "xno"; then
+if test "x$HAVE_BZ2" = "xno"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libbz2 not found, matroska demuxer will not be able to read bz2 tracks" >&5
$as_echo "$as_me: WARNING: libbz2 not found, matroska demuxer will not be able to read bz2 tracks" >&2;}
fi
@@ -17458,8 +17419,8 @@ fi
emblibav_configure_args="$emblibav_configure_args --disable-avserver --disable-avplay\
--disable-avconv --disable-avprobe --enable-static --enable-pic \
--disable-encoder=flac --disable-decoder=cavs --disable-protocols --disable-devices\
- --disable-network --disable-hwaccels --disable-filters --disable-doc\
- --enable-optimizations"
+ --disable-network --disable-hwaccels --disable-dxva2 --disable-vdpau\
+ --disable-filters --disable-doc --enable-optimizations"
if test "x$enable_lgpl" != "xyes"; then
emblibav_configure_args="$emblibav_configure_args --enable-gpl"
@@ -18228,7 +18189,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by GStreamer libav $as_me 1.1.3, which was
+This file was extended by GStreamer libav $as_me 1.1.4, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -18294,7 +18255,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-GStreamer libav config.status 1.1.3
+GStreamer libav config.status 1.1.4
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index 02eaefe..65d5302 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,14 +3,14 @@ AC_PREREQ(2.62)
dnl initialize autoconf
dnl when going to/from release please set the nano (fourth number) right !
dnl releases only do Wall, cvs and prerelease does Werror too
-AC_INIT(GStreamer libav, 1.1.3,
+AC_INIT(GStreamer libav, 1.1.4,
http://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer,
gst-libav)
AG_GST_INIT
dnl initialize automake
-AM_INIT_AUTOMAKE([-Wno-portability 1.11 no-dist-gzip dist-xz tar-ustar])
+AM_INIT_AUTOMAKE([-Wno-portability 1.11 no-dist-gzip dist-xz tar-ustar subdir-objects])
dnl define PACKAGE_VERSION_* variables
AS_VERSION
@@ -42,11 +42,11 @@ GST_API_VERSION=1.0
AC_SUBST(GST_API_VERSION)
AG_GST_LIBTOOL_PREPARE
-AS_LIBTOOL(GST, 103, 0, 103)
+AS_LIBTOOL(GST, 104, 0, 104)
dnl *** required versions of GStreamer stuff ***
-GST_REQ=1.1.3
-GST_PBREQ=1.1.3
+GST_REQ=1.1.4
+GST_PBREQ=1.1.4
ORC_REQ=0.4.16
ORC_CHECK([$ORC_REQ])
@@ -222,9 +222,14 @@ esac
AC_SUBST(DARWIN_LDFLAGS)
dnl *** Check for bz2
-AG_GST_CHECK_LIBHEADER(BZ2, bz2, BZ2_bzlibVersion, , bzlib.h, have_bz2=yes, have_bz2=no)
-AM_CONDITIONAL(HAVE_BZ2, test "x$have_bz2" = "xyes")
-if test "x$have_bz2" = "xno"; then
+save_LIBS=$LIBS
+LIBS="$LIBS -lbz2"
+AC_MSG_CHECKING([for BZ2_bzlibVersion in -lbz2])
+AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <bzlib.h>]], [[const char *version = BZ2_bzlibVersion ();]])],[HAVE_BZ2=yes],[HAVE_BZ2=no])
+AC_MSG_RESULT($HAVE_BZ2)
+LIBS=$save_LIBS
+AM_CONDITIONAL(HAVE_BZ2, test "x$HAVE_BZ2" = "xyes")
+if test "x$HAVE_BZ2" = "xno"; then
AC_WARN([libbz2 not found, matroska demuxer will not be able to read bz2 tracks])
fi
@@ -338,8 +343,8 @@ else
emblibav_configure_args="$emblibav_configure_args --disable-avserver --disable-avplay\
--disable-avconv --disable-avprobe --enable-static --enable-pic \
--disable-encoder=flac --disable-decoder=cavs --disable-protocols --disable-devices\
- --disable-network --disable-hwaccels --disable-filters --disable-doc\
- --enable-optimizations"
+ --disable-network --disable-hwaccels --disable-dxva2 --disable-vdpau\
+ --disable-filters --disable-doc --enable-optimizations"
if test "x$enable_lgpl" != "xyes"; then
emblibav_configure_args="$emblibav_configure_args --enable-gpl"
diff --git a/docs/Makefile.in b/docs/Makefile.in
index cb29dfb..b96b518 100644
--- a/docs/Makefile.in
+++ b/docs/Makefile.in
@@ -94,7 +94,6 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \
$(top_srcdir)/common/m4/gst-check.m4 \
$(top_srcdir)/common/m4/gst-doc.m4 \
$(top_srcdir)/common/m4/gst-error.m4 \
- $(top_srcdir)/common/m4/gst-feature.m4 \
$(top_srcdir)/common/m4/gst-platform.m4 \
$(top_srcdir)/common/m4/gst-plugin-docs.m4 \
$(top_srcdir)/common/m4/gst-plugindir.m4 \
@@ -260,7 +259,6 @@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
GTKDOC_MKPDF = @GTKDOC_MKPDF@
GTKDOC_REBASE = @GTKDOC_REBASE@
-HAVE_BZ2 = @HAVE_BZ2@
HAVE_DOCBOOK2PS = @HAVE_DOCBOOK2PS@
HAVE_DVIPS = @HAVE_DVIPS@
HAVE_EPSTOPDF = @HAVE_EPSTOPDF@
diff --git a/ext/Makefile.in b/ext/Makefile.in
index 74c6872..df7f686 100644
--- a/ext/Makefile.in
+++ b/ext/Makefile.in
@@ -93,7 +93,6 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \
$(top_srcdir)/common/m4/gst-check.m4 \
$(top_srcdir)/common/m4/gst-doc.m4 \
$(top_srcdir)/common/m4/gst-error.m4 \
- $(top_srcdir)/common/m4/gst-feature.m4 \
$(top_srcdir)/common/m4/gst-platform.m4 \
$(top_srcdir)/common/m4/gst-plugin-docs.m4 \
$(top_srcdir)/common/m4/gst-plugindir.m4 \
@@ -259,7 +258,6 @@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
GTKDOC_MKPDF = @GTKDOC_MKPDF@
GTKDOC_REBASE = @GTKDOC_REBASE@
-HAVE_BZ2 = @HAVE_BZ2@
HAVE_DOCBOOK2PS = @HAVE_DOCBOOK2PS@
HAVE_DVIPS = @HAVE_DVIPS@
HAVE_EPSTOPDF = @HAVE_EPSTOPDF@
diff --git a/ext/libav/Makefile.in b/ext/libav/Makefile.in
index 76353f9..85f99e5 100644
--- a/ext/libav/Makefile.in
+++ b/ext/libav/Makefile.in
@@ -103,7 +103,6 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \
$(top_srcdir)/common/m4/gst-check.m4 \
$(top_srcdir)/common/m4/gst-doc.m4 \
$(top_srcdir)/common/m4/gst-error.m4 \
- $(top_srcdir)/common/m4/gst-feature.m4 \
$(top_srcdir)/common/m4/gst-platform.m4 \
$(top_srcdir)/common/m4/gst-plugin-docs.m4 \
$(top_srcdir)/common/m4/gst-plugindir.m4 \
@@ -297,7 +296,6 @@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
GTKDOC_MKPDF = @GTKDOC_MKPDF@
GTKDOC_REBASE = @GTKDOC_REBASE@
-HAVE_BZ2 = @HAVE_BZ2@
HAVE_DOCBOOK2PS = @HAVE_DOCBOOK2PS@
HAVE_DVIPS = @HAVE_DVIPS@
HAVE_EPSTOPDF = @HAVE_EPSTOPDF@
@@ -576,22 +574,25 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstlibav_la-gstavvidenc.Plo@am__quote@
.c.o:
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@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 $<
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
.c.obj:
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@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 `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
.c.lo:
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@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 $@ $<
diff --git a/ext/libav/gstavcodecmap.c b/ext/libav/gstavcodecmap.c
index 88d19a0..f705f34 100644
--- a/ext/libav/gstavcodecmap.c
+++ b/ext/libav/gstavcodecmap.c
@@ -3080,6 +3080,8 @@ gst_ffmpeg_formatid_to_caps (const gchar * format_name)
caps = gst_caps_from_string ("video/webm");
} else if (!strcmp (format_name, "voc")) {
caps = gst_caps_from_string ("audio/x-voc");
+ } else if (!strcmp (format_name, "pva")) {
+ caps = gst_caps_from_string ("video/x-pva");
} else {
gchar *name;
@@ -3258,6 +3260,18 @@ gst_ffmpeg_formatid_get_codecids (const gchar * format_name,
*video_codec_list = tmp_vlist;
*audio_codec_list = tmp_alist;
+ } else if ((!strcmp (format_name, "pva"))) {
+ static enum CodecID tgp_video_list[] = {
+ AV_CODEC_ID_MPEG2VIDEO,
+ AV_CODEC_ID_NONE
+ };
+ static enum CodecID tgp_audio_list[] = {
+ AV_CODEC_ID_MP2,
+ AV_CODEC_ID_NONE
+ };
+
+ *video_codec_list = tgp_video_list;
+ *audio_codec_list = tgp_audio_list;
} else {
GST_LOG ("Format %s not found", format_name);
return FALSE;
diff --git a/ext/libav/gstavdemux.c b/ext/libav/gstavdemux.c
index d0df524..74e4a39 100644
--- a/ext/libav/gstavdemux.c
+++ b/ext/libav/gstavdemux.c
@@ -2003,6 +2003,7 @@ gst_ffmpegdemux_register (GstPlugin * plugin)
!strcmp (in_plugin->name, "nuv") ||
!strcmp (in_plugin->name, "swf") ||
!strcmp (in_plugin->name, "voc") ||
+ !strcmp (in_plugin->name, "pva") ||
!strcmp (in_plugin->name, "gif") || !strcmp (in_plugin->name, "vc1test")
)
register_typefind_func = FALSE;
@@ -2039,6 +2040,7 @@ gst_ffmpegdemux_register (GstPlugin * plugin)
!strcmp (in_plugin->name, "aiff") ||
!strcmp (in_plugin->name, "4xm") ||
!strcmp (in_plugin->name, "yuv4mpegpipe") ||
+ !strcmp (in_plugin->name, "pva") ||
!strcmp (in_plugin->name, "mpc") || !strcmp (in_plugin->name, "gif"))
rank = GST_RANK_MARGINAL;
else {
diff --git a/ext/libav/gstavmux.c b/ext/libav/gstavmux.c
index 2ee95b9..e15931c 100644
--- a/ext/libav/gstavmux.c
+++ b/ext/libav/gstavmux.c
@@ -939,6 +939,8 @@ gst_ffmpegmux_register (GstPlugin * plugin)
while (*p) {
if (*p == '.')
*p = '_';
+ if (*p == ',')
+ *p = '_';
p++;
}
diff --git a/ext/libav/gstavviddec.c b/ext/libav/gstavviddec.c
index 042c110..d5dc37d 100644
--- a/ext/libav/gstavviddec.c
+++ b/ext/libav/gstavviddec.c
@@ -69,8 +69,7 @@ static gboolean gst_ffmpegviddec_set_format (GstVideoDecoder * decoder,
static GstFlowReturn gst_ffmpegviddec_handle_frame (GstVideoDecoder * decoder,
GstVideoCodecFrame * frame);
static gboolean gst_ffmpegviddec_stop (GstVideoDecoder * decoder);
-static gboolean gst_ffmpegviddec_reset (GstVideoDecoder * decoder,
- gboolean hard);
+static gboolean gst_ffmpegviddec_flush (GstVideoDecoder * decoder);
static gboolean gst_ffmpegviddec_decide_allocation (GstVideoDecoder * decoder,
GstQuery * query);
static gboolean gst_ffmpegviddec_propose_allocation (GstVideoDecoder * decoder,
@@ -236,7 +235,7 @@ gst_ffmpegviddec_class_init (GstFFMpegVidDecClass * klass)
viddec_class->set_format = gst_ffmpegviddec_set_format;
viddec_class->handle_frame = gst_ffmpegviddec_handle_frame;
viddec_class->stop = gst_ffmpegviddec_stop;
- viddec_class->reset = gst_ffmpegviddec_reset;
+ viddec_class->flush = gst_ffmpegviddec_flush;
viddec_class->finish = gst_ffmpegviddec_finish;
viddec_class->decide_allocation = gst_ffmpegviddec_decide_allocation;
viddec_class->propose_allocation = gst_ffmpegviddec_propose_allocation;
@@ -1437,13 +1436,12 @@ gst_ffmpegviddec_finish (GstVideoDecoder * decoder)
}
static gboolean
-gst_ffmpegviddec_reset (GstVideoDecoder * decoder, gboolean hard)
+gst_ffmpegviddec_flush (GstVideoDecoder * decoder)
{
GstFFMpegVidDec *ffmpegdec = (GstFFMpegVidDec *) decoder;
- if (ffmpegdec->opened) {
+ if (ffmpegdec->opened)
avcodec_flush_buffers (ffmpegdec->context);
- }
return TRUE;
}
diff --git a/ext/libav/gstavvidenc.c b/ext/libav/gstavvidenc.c
index 00feafc..ca89156 100644
--- a/ext/libav/gstavvidenc.c
+++ b/ext/libav/gstavvidenc.c
@@ -98,8 +98,7 @@ static gboolean gst_ffmpegvidenc_set_format (GstVideoEncoder * encoder,
GstVideoCodecState * state);
static gboolean gst_ffmpegvidenc_propose_allocation (GstVideoEncoder * encoder,
GstQuery * query);
-static gboolean gst_ffmpegvidenc_reset (GstVideoEncoder * encoder,
- gboolean hard);
+static gboolean gst_ffmpegvidenc_flush (GstVideoEncoder * encoder);
static GstCaps *gst_ffmpegvidenc_getcaps (GstVideoEncoder * encoder,
GstCaps * filter);
@@ -215,7 +214,7 @@ gst_ffmpegvidenc_class_init (GstFFMpegVidEncClass * klass)
venc_class->getcaps = gst_ffmpegvidenc_getcaps;
venc_class->set_format = gst_ffmpegvidenc_set_format;
venc_class->propose_allocation = gst_ffmpegvidenc_propose_allocation;
- venc_class->reset = gst_ffmpegvidenc_reset;
+ venc_class->flush = gst_ffmpegvidenc_flush;
gobject_class->finalize = gst_ffmpegvidenc_finalize;
}
@@ -645,10 +644,11 @@ alloc_fail:
}
}
-static void
+static GstFlowReturn
gst_ffmpegvidenc_flush_buffers (GstFFMpegVidEnc * ffmpegenc, gboolean send)
{
GstVideoCodecFrame *frame;
+ GstFlowReturn flow_ret = GST_FLOW_OK;
GstBuffer *outbuf;
gint ret_size;
@@ -656,7 +656,7 @@ gst_ffmpegvidenc_flush_buffers (GstFFMpegVidEnc * ffmpegenc, gboolean send)
/* no need to empty codec if there is none */
if (!ffmpegenc->opened)
- return;
+ goto done;
while ((frame =
gst_video_encoder_get_oldest_frame (GST_VIDEO_ENCODER (ffmpegenc)))) {
@@ -702,11 +702,16 @@ gst_ffmpegvidenc_flush_buffers (GstFFMpegVidEnc * ffmpegenc, gboolean send)
if (ffmpegenc->context->coded_frame->key_frame)
GST_VIDEO_CODEC_FRAME_SET_SYNC_POINT (frame);
- gst_video_encoder_finish_frame (GST_VIDEO_ENCODER (ffmpegenc), frame);
+ flow_ret =
+ gst_video_encoder_finish_frame (GST_VIDEO_ENCODER (ffmpegenc), frame);
} else {
gst_video_codec_frame_unref (frame);
}
}
+
+done:
+
+ return flow_ret;
}
@@ -782,13 +787,12 @@ gst_ffmpegvidenc_get_property (GObject * object,
}
static gboolean
-gst_ffmpegvidenc_reset (GstVideoEncoder * encoder, gboolean hard)
+gst_ffmpegvidenc_flush (GstVideoEncoder * encoder)
{
GstFFMpegVidEnc *ffmpegenc = (GstFFMpegVidEnc *) encoder;
- if (ffmpegenc->opened) {
+ if (ffmpegenc->opened)
avcodec_flush_buffers (ffmpegenc->context);
- }
return TRUE;
}
@@ -819,9 +823,7 @@ gst_ffmpegvidenc_finish (GstVideoEncoder * encoder)
{
GstFFMpegVidEnc *ffmpegenc = (GstFFMpegVidEnc *) encoder;
- gst_ffmpegvidenc_flush_buffers (ffmpegenc, TRUE);
-
- return GST_FLOW_OK;
+ return gst_ffmpegvidenc_flush_buffers (ffmpegenc, TRUE);
}
gboolean
diff --git a/ext/libswscale/Makefile.in b/ext/libswscale/Makefile.in
index 085053a..3f93142 100644
--- a/ext/libswscale/Makefile.in
+++ b/ext/libswscale/Makefile.in
@@ -101,7 +101,6 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \
$(top_srcdir)/common/m4/gst-check.m4 \
$(top_srcdir)/common/m4/gst-doc.m4 \
$(top_srcdir)/common/m4/gst-error.m4 \
- $(top_srcdir)/common/m4/gst-feature.m4 \
$(top_srcdir)/common/m4/gst-platform.m4 \
$(top_srcdir)/common/m4/gst-plugin-docs.m4 \
$(top_srcdir)/common/m4/gst-plugindir.m4 \
@@ -288,7 +287,6 @@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
GTKDOC_MKPDF = @GTKDOC_MKPDF@
GTKDOC_REBASE = @GTKDOC_REBASE@
-HAVE_BZ2 = @HAVE_BZ2@
HAVE_DOCBOOK2PS = @HAVE_DOCBOOK2PS@
HAVE_DVIPS = @HAVE_DVIPS@
HAVE_EPSTOPDF = @HAVE_EPSTOPDF@
@@ -528,22 +526,25 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstavscale_la-gstffmpegscale.Plo@am__quote@
.c.o:
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@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 $<
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
.c.obj:
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@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 `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
.c.lo:
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@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 $@ $<
diff --git a/gst-libav.doap b/gst-libav.doap
index 16e98b1..c84c3dd 100644
--- a/gst-libav.doap
+++ b/gst-libav.doap
@@ -34,6 +34,16 @@ colorspace conversion elements.
<release>
<Version>
+ <revision>1.1.4</revision>
+ <branch>1.1</branch>
+ <name></name>
+ <created>2013-08-28</created>
+ <file-release rdf:resource="http://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.1.4.tar.xz" />
+ </Version>
+ </release>
+
+ <release>
+ <Version>
<revision>1.1.3</revision>
<branch>1.1</branch>
<name></name>
diff --git a/gst-libav.spec b/gst-libav.spec
index 3672da4..9f65312 100644
--- a/gst-libav.spec
+++ b/gst-libav.spec
@@ -4,7 +4,7 @@
%define gst_majorminor 1.0
Name: %{gstreamer}-libav
-Version: 1.1.3
+Version: 1.1.4
Release: 1
Summary: GStreamer Streaming-media framework plug-in using libav (FFmpeg).
Group: Libraries/Multimedia
diff --git a/gst-libs/Makefile.in b/gst-libs/Makefile.in
index 25fcbc7..4f99792 100644
--- a/gst-libs/Makefile.in
+++ b/gst-libs/Makefile.in
@@ -93,7 +93,6 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \
$(top_srcdir)/common/m4/gst-check.m4 \
$(top_srcdir)/common/m4/gst-doc.m4 \
$(top_srcdir)/common/m4/gst-error.m4 \
- $(top_srcdir)/common/m4/gst-feature.m4 \
$(top_srcdir)/common/m4/gst-platform.m4 \
$(top_srcdir)/common/m4/gst-plugin-docs.m4 \
$(top_srcdir)/common/m4/gst-plugindir.m4 \
@@ -260,7 +259,6 @@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
GTKDOC_MKPDF = @GTKDOC_MKPDF@
GTKDOC_REBASE = @GTKDOC_REBASE@
-HAVE_BZ2 = @HAVE_BZ2@
HAVE_DOCBOOK2PS = @HAVE_DOCBOOK2PS@
HAVE_DVIPS = @HAVE_DVIPS@
HAVE_EPSTOPDF = @HAVE_EPSTOPDF@
diff --git a/gst-libs/ext/Makefile.in b/gst-libs/ext/Makefile.in
index 1f36ab0..cf0b0ba 100644
--- a/gst-libs/ext/Makefile.in
+++ b/gst-libs/ext/Makefile.in
@@ -103,7 +103,6 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \
$(top_srcdir)/common/m4/gst-check.m4 \
$(top_srcdir)/common/m4/gst-doc.m4 \
$(top_srcdir)/common/m4/gst-error.m4 \
- $(top_srcdir)/common/m4/gst-feature.m4 \
$(top_srcdir)/common/m4/gst-platform.m4 \
$(top_srcdir)/common/m4/gst-plugin-docs.m4 \
$(top_srcdir)/common/m4/gst-plugindir.m4 \
@@ -269,7 +268,6 @@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
GTKDOC_MKPDF = @GTKDOC_MKPDF@
GTKDOC_REBASE = @GTKDOC_REBASE@
-HAVE_BZ2 = @HAVE_BZ2@
HAVE_DOCBOOK2PS = @HAVE_DOCBOOK2PS@
HAVE_DVIPS = @HAVE_DVIPS@
HAVE_EPSTOPDF = @HAVE_EPSTOPDF@
diff --git a/pkgconfig/Makefile.in b/pkgconfig/Makefile.in
index 218cd04..63fdb22 100644
--- a/pkgconfig/Makefile.in
+++ b/pkgconfig/Makefile.in
@@ -94,7 +94,6 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \
$(top_srcdir)/common/m4/gst-check.m4 \
$(top_srcdir)/common/m4/gst-doc.m4 \
$(top_srcdir)/common/m4/gst-error.m4 \
- $(top_srcdir)/common/m4/gst-feature.m4 \
$(top_srcdir)/common/m4/gst-platform.m4 \
$(top_srcdir)/common/m4/gst-plugin-docs.m4 \
$(top_srcdir)/common/m4/gst-plugindir.m4 \
@@ -201,7 +200,6 @@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
GTKDOC_MKPDF = @GTKDOC_MKPDF@
GTKDOC_REBASE = @GTKDOC_REBASE@
-HAVE_BZ2 = @HAVE_BZ2@
HAVE_DOCBOOK2PS = @HAVE_DOCBOOK2PS@
HAVE_DVIPS = @HAVE_DVIPS@
HAVE_EPSTOPDF = @HAVE_EPSTOPDF@
diff --git a/tests/Makefile.in b/tests/Makefile.in
index f3928ed..e6636b6 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -93,7 +93,6 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \
$(top_srcdir)/common/m4/gst-check.m4 \
$(top_srcdir)/common/m4/gst-doc.m4 \
$(top_srcdir)/common/m4/gst-error.m4 \
- $(top_srcdir)/common/m4/gst-feature.m4 \
$(top_srcdir)/common/m4/gst-platform.m4 \
$(top_srcdir)/common/m4/gst-plugin-docs.m4 \
$(top_srcdir)/common/m4/gst-plugindir.m4 \
@@ -259,7 +258,6 @@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
GTKDOC_MKPDF = @GTKDOC_MKPDF@
GTKDOC_REBASE = @GTKDOC_REBASE@
-HAVE_BZ2 = @HAVE_BZ2@
HAVE_DOCBOOK2PS = @HAVE_DOCBOOK2PS@
HAVE_DVIPS = @HAVE_DVIPS@
HAVE_EPSTOPDF = @HAVE_EPSTOPDF@
diff --git a/tests/check/Makefile.in b/tests/check/Makefile.in
index f6ca898..aed9a4d 100644
--- a/tests/check/Makefile.in
+++ b/tests/check/Makefile.in
@@ -100,7 +100,6 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \
$(top_srcdir)/common/m4/gst-check.m4 \
$(top_srcdir)/common/m4/gst-doc.m4 \
$(top_srcdir)/common/m4/gst-error.m4 \
- $(top_srcdir)/common/m4/gst-feature.m4 \
$(top_srcdir)/common/m4/gst-platform.m4 \
$(top_srcdir)/common/m4/gst-plugin-docs.m4 \
$(top_srcdir)/common/m4/gst-plugindir.m4 \
@@ -118,7 +117,8 @@ CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
PROGRAMS = $(noinst_PROGRAMS)
elements_avdec_adpcm_SOURCES = elements/avdec_adpcm.c
-elements_avdec_adpcm_OBJECTS = avdec_adpcm.$(OBJEXT)
+am__dirstamp = $(am__leading_dot)dirstamp
+elements_avdec_adpcm_OBJECTS = elements/avdec_adpcm.$(OBJEXT)
elements_avdec_adpcm_LDADD = $(LDADD)
am__DEPENDENCIES_1 =
elements_avdec_adpcm_DEPENDENCIES = $(am__DEPENDENCIES_1)
@@ -126,17 +126,17 @@ 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 =
-am__dirstamp = $(am__leading_dot)dirstamp
elements_avdemux_ape_SOURCES = elements/avdemux_ape.c
-elements_avdemux_ape_OBJECTS = avdemux_ape.$(OBJEXT)
+elements_avdemux_ape_OBJECTS = elements/avdemux_ape.$(OBJEXT)
elements_avdemux_ape_LDADD = $(LDADD)
elements_avdemux_ape_DEPENDENCIES = $(am__DEPENDENCIES_1)
generic_libavcodec_locking_SOURCES = generic/libavcodec-locking.c
-generic_libavcodec_locking_OBJECTS = libavcodec-locking.$(OBJEXT)
+generic_libavcodec_locking_OBJECTS = \
+ generic/libavcodec-locking.$(OBJEXT)
generic_libavcodec_locking_LDADD = $(LDADD)
generic_libavcodec_locking_DEPENDENCIES = $(am__DEPENDENCIES_1)
generic_plugin_test_SOURCES = generic/plugin-test.c
-generic_plugin_test_OBJECTS = plugin-test.$(OBJEXT)
+generic_plugin_test_OBJECTS = generic/plugin-test.$(OBJEXT)
generic_plugin_test_LDADD = $(LDADD)
generic_plugin_test_DEPENDENCIES = $(am__DEPENDENCIES_1)
AM_V_P = $(am__v_P_@AM_V@)
@@ -476,7 +476,6 @@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
GTKDOC_MKPDF = @GTKDOC_MKPDF@
GTKDOC_REBASE = @GTKDOC_REBASE@
-HAVE_BZ2 = @HAVE_BZ2@
HAVE_DOCBOOK2PS = @HAVE_DOCBOOK2PS@
HAVE_DVIPS = @HAVE_DVIPS@
HAVE_EPSTOPDF = @HAVE_EPSTOPDF@
@@ -709,10 +708,17 @@ clean-noinstPROGRAMS:
elements/$(am__dirstamp):
@$(MKDIR_P) elements
@: > elements/$(am__dirstamp)
+elements/$(DEPDIR)/$(am__dirstamp):
+ @$(MKDIR_P) elements/$(DEPDIR)
+ @: > elements/$(DEPDIR)/$(am__dirstamp)
+elements/avdec_adpcm.$(OBJEXT): elements/$(am__dirstamp) \
+ elements/$(DEPDIR)/$(am__dirstamp)
elements/avdec_adpcm$(EXEEXT): $(elements_avdec_adpcm_OBJECTS) $(elements_avdec_adpcm_DEPENDENCIES) $(EXTRA_elements_avdec_adpcm_DEPENDENCIES) elements/$(am__dirstamp)
@rm -f elements/avdec_adpcm$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(elements_avdec_adpcm_OBJECTS) $(elements_avdec_adpcm_LDADD) $(LIBS)
+elements/avdemux_ape.$(OBJEXT): elements/$(am__dirstamp) \
+ elements/$(DEPDIR)/$(am__dirstamp)
elements/avdemux_ape$(EXEEXT): $(elements_avdemux_ape_OBJECTS) $(elements_avdemux_ape_DEPENDENCIES) $(EXTRA_elements_avdemux_ape_DEPENDENCIES) elements/$(am__dirstamp)
@rm -f elements/avdemux_ape$(EXEEXT)
@@ -720,10 +726,17 @@ elements/avdemux_ape$(EXEEXT): $(elements_avdemux_ape_OBJECTS) $(elements_avdemu
generic/$(am__dirstamp):
@$(MKDIR_P) generic
@: > generic/$(am__dirstamp)
+generic/$(DEPDIR)/$(am__dirstamp):
+ @$(MKDIR_P) generic/$(DEPDIR)
+ @: > generic/$(DEPDIR)/$(am__dirstamp)
+generic/libavcodec-locking.$(OBJEXT): generic/$(am__dirstamp) \
+ generic/$(DEPDIR)/$(am__dirstamp)
generic/libavcodec-locking$(EXEEXT): $(generic_libavcodec_locking_OBJECTS) $(generic_libavcodec_locking_DEPENDENCIES) $(EXTRA_generic_libavcodec_locking_DEPENDENCIES) generic/$(am__dirstamp)
@rm -f generic/libavcodec-locking$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(generic_libavcodec_locking_OBJECTS) $(generic_libavcodec_locking_LDADD) $(LIBS)
+generic/plugin-test.$(OBJEXT): generic/$(am__dirstamp) \
+ generic/$(DEPDIR)/$(am__dirstamp)
generic/plugin-test$(EXEEXT): $(generic_plugin_test_OBJECTS) $(generic_plugin_test_DEPENDENCIES) $(EXTRA_generic_plugin_test_DEPENDENCIES) generic/$(am__dirstamp)
@rm -f generic/plugin-test$(EXEEXT)
@@ -731,92 +744,41 @@ generic/plugin-test$(EXEEXT): $(generic_plugin_test_OBJECTS) $(generic_plugin_te
mostlyclean-compile:
-rm -f *.$(OBJEXT)
+ -rm -f elements/*.$(OBJEXT)
+ -rm -f generic/*.$(OBJEXT)
distclean-compile:
-rm -f *.tab.c
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/avdec_adpcm.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/avdemux_ape.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libavcodec-locking.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/plugin-test.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@elements/$(DEPDIR)/avdec_adpcm.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@elements/$(DEPDIR)/avdemux_ape.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@generic/$(DEPDIR)/libavcodec-locking.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@generic/$(DEPDIR)/plugin-test.Po@am__quote@
.c.o:
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@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 $<
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
.c.obj:
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@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 `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
.c.lo:
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@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 $@ $<
-avdec_adpcm.o: elements/avdec_adpcm.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT avdec_adpcm.o -MD -MP -MF $(DEPDIR)/avdec_adpcm.Tpo -c -o avdec_adpcm.o `test -f 'elements/avdec_adpcm.c' || echo '$(srcdir)/'`elements/avdec_adpcm.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/avdec_adpcm.Tpo $(DEPDIR)/avdec_adpcm.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='elements/avdec_adpcm.c' object='avdec_adpcm.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) $(AM_CFLAGS) $(CFLAGS) -c -o avdec_adpcm.o `test -f 'elements/avdec_adpcm.c' || echo '$(srcdir)/'`elements/avdec_adpcm.c
-
-avdec_adpcm.obj: elements/avdec_adpcm.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT avdec_adpcm.obj -MD -MP -MF $(DEPDIR)/avdec_adpcm.Tpo -c -o avdec_adpcm.obj `if test -f 'elements/avdec_adpcm.c'; then $(CYGPATH_W) 'elements/avdec_adpcm.c'; else $(CYGPATH_W) '$(srcdir)/elements/avdec_adpcm.c'; fi`
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/avdec_adpcm.Tpo $(DEPDIR)/avdec_adpcm.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='elements/avdec_adpcm.c' object='avdec_adpcm.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) $(AM_CFLAGS) $(CFLAGS) -c -o avdec_adpcm.obj `if test -f 'elements/avdec_adpcm.c'; then $(CYGPATH_W) 'elements/avdec_adpcm.c'; else $(CYGPATH_W) '$(srcdir)/elements/avdec_adpcm.c'; fi`
-
-avdemux_ape.o: elements/avdemux_ape.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT avdemux_ape.o -MD -MP -MF $(DEPDIR)/avdemux_ape.Tpo -c -o avdemux_ape.o `test -f 'elements/avdemux_ape.c' || echo '$(srcdir)/'`elements/avdemux_ape.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/avdemux_ape.Tpo $(DEPDIR)/avdemux_ape.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='elements/avdemux_ape.c' object='avdemux_ape.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) $(AM_CFLAGS) $(CFLAGS) -c -o avdemux_ape.o `test -f 'elements/avdemux_ape.c' || echo '$(srcdir)/'`elements/avdemux_ape.c
-
-avdemux_ape.obj: elements/avdemux_ape.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT avdemux_ape.obj -MD -MP -MF $(DEPDIR)/avdemux_ape.Tpo -c -o avdemux_ape.obj `if test -f 'elements/avdemux_ape.c'; then $(CYGPATH_W) 'elements/avdemux_ape.c'; else $(CYGPATH_W) '$(srcdir)/elements/avdemux_ape.c'; fi`
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/avdemux_ape.Tpo $(DEPDIR)/avdemux_ape.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='elements/avdemux_ape.c' object='avdemux_ape.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) $(AM_CFLAGS) $(CFLAGS) -c -o avdemux_ape.obj `if test -f 'elements/avdemux_ape.c'; then $(CYGPATH_W) 'elements/avdemux_ape.c'; else $(CYGPATH_W) '$(srcdir)/elements/avdemux_ape.c'; fi`
-
-libavcodec-locking.o: generic/libavcodec-locking.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libavcodec-locking.o -MD -MP -MF $(DEPDIR)/libavcodec-locking.Tpo -c -o libavcodec-locking.o `test -f 'generic/libavcodec-locking.c' || echo '$(srcdir)/'`generic/libavcodec-locking.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libavcodec-locking.Tpo $(DEPDIR)/libavcodec-locking.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='generic/libavcodec-locking.c' object='libavcodec-locking.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) $(AM_CFLAGS) $(CFLAGS) -c -o libavcodec-locking.o `test -f 'generic/libavcodec-locking.c' || echo '$(srcdir)/'`generic/libavcodec-locking.c
-
-libavcodec-locking.obj: generic/libavcodec-locking.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libavcodec-locking.obj -MD -MP -MF $(DEPDIR)/libavcodec-locking.Tpo -c -o libavcodec-locking.obj `if test -f 'generic/libavcodec-locking.c'; then $(CYGPATH_W) 'generic/libavcodec-locking.c'; else $(CYGPATH_W) '$(srcdir)/generic/libavcodec-locking.c'; fi`
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libavcodec-locking.Tpo $(DEPDIR)/libavcodec-locking.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='generic/libavcodec-locking.c' object='libavcodec-locking.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) $(AM_CFLAGS) $(CFLAGS) -c -o libavcodec-locking.obj `if test -f 'generic/libavcodec-locking.c'; then $(CYGPATH_W) 'generic/libavcodec-locking.c'; else $(CYGPATH_W) '$(srcdir)/generic/libavcodec-locking.c'; fi`
-
-plugin-test.o: generic/plugin-test.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT plugin-test.o -MD -MP -MF $(DEPDIR)/plugin-test.Tpo -c -o plugin-test.o `test -f 'generic/plugin-test.c' || echo '$(srcdir)/'`generic/plugin-test.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/plugin-test.Tpo $(DEPDIR)/plugin-test.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='generic/plugin-test.c' object='plugin-test.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) $(AM_CFLAGS) $(CFLAGS) -c -o plugin-test.o `test -f 'generic/plugin-test.c' || echo '$(srcdir)/'`generic/plugin-test.c
-
-plugin-test.obj: generic/plugin-test.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT plugin-test.obj -MD -MP -MF $(DEPDIR)/plugin-test.Tpo -c -o plugin-test.obj `if test -f 'generic/plugin-test.c'; then $(CYGPATH_W) 'generic/plugin-test.c'; else $(CYGPATH_W) '$(srcdir)/generic/plugin-test.c'; fi`
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/plugin-test.Tpo $(DEPDIR)/plugin-test.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='generic/plugin-test.c' object='plugin-test.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) $(AM_CFLAGS) $(CFLAGS) -c -o plugin-test.obj `if test -f 'generic/plugin-test.c'; then $(CYGPATH_W) 'generic/plugin-test.c'; else $(CYGPATH_W) '$(srcdir)/generic/plugin-test.c'; fi`
-
mostlyclean-libtool:
-rm -f *.lo
@@ -1127,7 +1089,9 @@ 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)
+ -rm -f elements/$(DEPDIR)/$(am__dirstamp)
-rm -f elements/$(am__dirstamp)
+ -rm -f generic/$(DEPDIR)/$(am__dirstamp)
-rm -f generic/$(am__dirstamp)
maintainer-clean-generic:
@@ -1139,7 +1103,7 @@ clean-am: clean-checkPROGRAMS clean-generic clean-libtool clean-local \
clean-noinstPROGRAMS mostlyclean-am
distclean: distclean-am
- -rm -rf ./$(DEPDIR)
+ -rm -rf elements/$(DEPDIR) generic/$(DEPDIR)
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
distclean-tags
@@ -1185,7 +1149,7 @@ install-ps-am:
installcheck-am:
maintainer-clean: maintainer-clean-am
- -rm -rf ./$(DEPDIR)
+ -rm -rf elements/$(DEPDIR) generic/$(DEPDIR)
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
diff --git a/tests/check/elements/avdemux_ape.c b/tests/check/elements/avdemux_ape.c
index 4362201..99dbd76 100644
--- a/tests/check/elements/avdemux_ape.c
+++ b/tests/check/elements/avdemux_ape.c
@@ -198,7 +198,7 @@ avdemux_ape_suite (void)
TCase *tc_chain = tcase_create ("general");
suite_add_tcase (s, tc_chain);
- tcase_skip_broken_test (tc_chain, test_tag_caching);
+ tcase_add_test (tc_chain, test_tag_caching);
return s;
}
diff --git a/tests/files/Makefile.in b/tests/files/Makefile.in
index 5493e7c..fbe5f30 100644
--- a/tests/files/Makefile.in
+++ b/tests/files/Makefile.in
@@ -93,7 +93,6 @@ am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \
$(top_srcdir)/common/m4/gst-check.m4 \
$(top_srcdir)/common/m4/gst-doc.m4 \
$(top_srcdir)/common/m4/gst-error.m4 \
- $(top_srcdir)/common/m4/gst-feature.m4 \
$(top_srcdir)/common/m4/gst-platform.m4 \
$(top_srcdir)/common/m4/gst-plugin-docs.m4 \
$(top_srcdir)/common/m4/gst-plugindir.m4 \
@@ -200,7 +199,6 @@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
GTKDOC_MKPDF = @GTKDOC_MKPDF@
GTKDOC_REBASE = @GTKDOC_REBASE@
-HAVE_BZ2 = @HAVE_BZ2@
HAVE_DOCBOOK2PS = @HAVE_DOCBOOK2PS@
HAVE_DVIPS = @HAVE_DVIPS@
HAVE_EPSTOPDF = @HAVE_EPSTOPDF@
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-08 16:26:59 +0000