diff options
author | Sebastian Dröge <sebastian@centricular.com> | 2014-07-11 11:45:46 +0200 |
---|---|---|
committer | Sebastian Dröge <sebastian@centricular.com> | 2014-07-11 11:45:46 +0200 |
commit | 46aa2188c7f3363edea4aadbaa349243b4ef1c41 (patch) | |
tree | a2f1f4ac2936b1848e07c33254c43a33cb25412b | |
parent | 5d58c3fcd74c3ecf4f64f82dd550e38e68177140 (diff) | |
parent | 1f36d9730840799660f0a74854e905a896540c72 (diff) |
Merge tag 'upstream/1.3.91'
Upstream version 1.3.91
-rw-r--r-- | ChangeLog | 17 | ||||
-rw-r--r-- | Makefile.in | 4 | ||||
-rw-r--r-- | NEWS | 2 | ||||
-rwxr-xr-x | configure | 38 | ||||
-rw-r--r-- | configure.ac | 8 | ||||
-rw-r--r-- | docs/plugins/html/gst-libav-plugins-plugin-libav.html | 2 | ||||
-rw-r--r-- | docs/plugins/html/index.html | 2 | ||||
-rw-r--r-- | docs/plugins/inspect/plugin-libav.xml | 2 | ||||
-rw-r--r-- | gst-libav.doap | 10 | ||||
-rw-r--r-- | gst-libav.spec | 2 |
10 files changed, 55 insertions, 32 deletions
@@ -1,9 +1,22 @@ +=== release 1.3.91 === + +2014-07-11 Sebastian Dröge <slomo@coaxion.net> + + * configure.ac: + releasing 1.3.91 + === release 1.3.90 === -2014-06-28 Sebastian Dröge <slomo@coaxion.net> +2014-06-28 11:44:41 +0200 Sebastian Dröge <sebastian@centricular.com> + * ChangeLog: + * NEWS: + * RELEASE: * configure.ac: - releasing 1.3.90 + * docs/plugins/gst-libav-plugins.hierarchy: + * docs/plugins/inspect/plugin-libav.xml: + * gst-libav.doap: + Release 1.3.90 2014-06-28 09:59:49 +0200 Sebastian Dröge <sebastian@centricular.com> diff --git a/Makefile.in b/Makefile.in index 63e110c..3aebc2c 100644 --- a/Makefile.in +++ b/Makefile.in @@ -95,8 +95,8 @@ DIST_COMMON = $(top_srcdir)/common/win32.mak \ ChangeLog $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ $(top_srcdir)/configure $(am__configure_deps) \ $(srcdir)/config.h.in $(srcdir)/gst-libav.spec.in COPYING \ - COPYING.LIB TODO compile config.guess config.sub install-sh \ - missing ltmain.sh + COPYING.LIB TODO compile config.guess config.sub depcomp \ + install-sh missing ltmain.sh subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \ @@ -1,4 +1,4 @@ -This is GStreamer Libav Plugins 1.3.90 +This is GStreamer Libav Plugins 1.3.91 Changes since 1.2: @@ -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.3.90. +# Generated by GNU Autoconf 2.69 for GStreamer libav 1.3.91. # # 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.3.90' -PACKAGE_STRING='GStreamer libav 1.3.90' +PACKAGE_VERSION='1.3.91' +PACKAGE_STRING='GStreamer libav 1.3.91' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer' PACKAGE_URL='' @@ -1495,7 +1495,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.3.90 to adapt to many kinds of systems. +\`configure' configures GStreamer libav 1.3.91 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1566,7 +1566,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of GStreamer libav 1.3.90:";; + short | recursive ) echo "Configuration of GStreamer libav 1.3.91:";; esac cat <<\_ACEOF @@ -1734,7 +1734,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -GStreamer libav configure 1.3.90 +GStreamer libav configure 1.3.91 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2149,7 +2149,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.3.90, which was +It was created by GStreamer libav $as_me 1.3.91, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3127,7 +3127,7 @@ fi # Define the identity of the package. PACKAGE='gst-libav' - VERSION='1.3.90' + VERSION='1.3.91' cat >>confdefs.h <<_ACEOF @@ -3338,9 +3338,9 @@ fi - PACKAGE_VERSION_MAJOR=$(echo 1.3.90 | cut -d'.' -f1) - PACKAGE_VERSION_MINOR=$(echo 1.3.90 | cut -d'.' -f2) - PACKAGE_VERSION_MICRO=$(echo 1.3.90 | cut -d'.' -f3) + PACKAGE_VERSION_MAJOR=$(echo 1.3.91 | cut -d'.' -f1) + PACKAGE_VERSION_MINOR=$(echo 1.3.91 | cut -d'.' -f2) + PACKAGE_VERSION_MICRO=$(echo 1.3.91 | cut -d'.' -f3) @@ -3351,7 +3351,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking nano version" >&5 $as_echo_n "checking nano version... " >&6; } - NANO=$(echo 1.3.90 | cut -d'.' -f4) + NANO=$(echo 1.3.91 | cut -d'.' -f4) if test x"$NANO" = x || test "x$NANO" = "x0" ; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: 0 (release)" >&5 @@ -8003,10 +8003,10 @@ fi done - GST_CURRENT=390 + GST_CURRENT=391 GST_REVISION=0 - GST_AGE=390 - GST_LIBVERSION=390:0:390 + GST_AGE=391 + GST_LIBVERSION=391:0:391 @@ -12331,8 +12331,8 @@ CC="$lt_save_CC" -GST_REQ=1.3.90 -GST_PBREQ=1.3.90 +GST_REQ=1.3.91 +GST_PBREQ=1.3.91 ORC_REQ=0.4.16 @@ -17461,7 +17461,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.3.90, which was +This file was extended by GStreamer libav $as_me 1.3.91, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -17527,7 +17527,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.3.90 +GStreamer libav config.status 1.3.91 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index b3f1de5..1ed5f56 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ 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.3.90, +AC_INIT(GStreamer libav, 1.3.91, http://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer, gst-libav) @@ -42,11 +42,11 @@ GST_API_VERSION=1.0 AC_SUBST(GST_API_VERSION) AG_GST_LIBTOOL_PREPARE -AS_LIBTOOL(GST, 390, 0, 390) +AS_LIBTOOL(GST, 391, 0, 391) dnl *** required versions of GStreamer stuff *** -GST_REQ=1.3.90 -GST_PBREQ=1.3.90 +GST_REQ=1.3.91 +GST_PBREQ=1.3.91 ORC_REQ=0.4.16 ORC_CHECK([$ORC_REQ]) diff --git a/docs/plugins/html/gst-libav-plugins-plugin-libav.html b/docs/plugins/html/gst-libav-plugins-plugin-libav.html index 03b8f3f..e9d69a3 100644 --- a/docs/plugins/html/gst-libav-plugins-plugin-libav.html +++ b/docs/plugins/html/gst-libav-plugins-plugin-libav.html @@ -42,7 +42,7 @@ </tr> <tr> <td><p><span class="term">version</span></p></td> -<td>1.3.90</td> +<td>1.3.91</td> </tr> <tr> <td><p><span class="term">run-time license</span></p></td> diff --git a/docs/plugins/html/index.html b/docs/plugins/html/index.html index 024be6d..ea47087 100644 --- a/docs/plugins/html/index.html +++ b/docs/plugins/html/index.html @@ -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 libav 1.0 Plugins Reference Manual</p></th></tr></table></div> <div><p class="releaseinfo"> - for GStreamer libav Plugins 1.0 (1.3.90) + for GStreamer libav Plugins 1.0 (1.3.91) 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-ffmpeg-plugins/html/" target="_top">http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gst-ffmpeg-plugins/html/</a>. </p></div> diff --git a/docs/plugins/inspect/plugin-libav.xml b/docs/plugins/inspect/plugin-libav.xml index baf0942..31f8396 100644 --- a/docs/plugins/inspect/plugin-libav.xml +++ b/docs/plugins/inspect/plugin-libav.xml @@ -3,7 +3,7 @@ <description>All libav codecs and formats (local snapshot)</description> <filename>../../ext/libav/.libs/libgstlibav.so</filename> <basename>libgstlibav.so</basename> - <version>1.3.90</version> + <version>1.3.91</version> <license>GPL</license> <source>gst-libav</source> <package>libav</package> diff --git a/gst-libav.doap b/gst-libav.doap index 39e9027..3e233a4 100644 --- a/gst-libav.doap +++ b/gst-libav.doap @@ -34,6 +34,16 @@ colorspace conversion elements. <release> <Version> + <revision>1.3.91</revision> + <branch>1.3</branch> + <name></name> + <created>2014-07-11</created> + <file-release rdf:resource="http://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.3.91.tar.xz" /> + </Version> + </release> + + <release> + <Version> <revision>1.3.90</revision> <branch>1.3</branch> <name></name> diff --git a/gst-libav.spec b/gst-libav.spec index d918a9f..e7b1ffb 100644 --- a/gst-libav.spec +++ b/gst-libav.spec @@ -4,7 +4,7 @@ %define gst_majorminor 1.0 Name: %{gstreamer}-libav -Version: 1.3.90 +Version: 1.3.91 Release: 1 Summary: GStreamer Streaming-media framework plug-in using libav (FFmpeg). Group: Libraries/Multimedia |