aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Dröge <sebastian@centricular.com>2014-07-19 17:51:32 +0200
committerSebastian Dröge <sebastian@centricular.com>2014-07-19 17:51:32 +0200
commitcda8a55b1e474bf41356648795982a48b6104289 (patch)
tree87999259c0b2804c4fe4eb28e1c740c70d535e1a
parent4cc67afa27c0f19d3d7b4adca9d7edbd1ace81d6 (diff)
parent0c63025a67be5495e0ec16972986918e0acca85b (diff)
Merge tag 'upstream/1.4.0'
Upstream version 1.4.0
-rw-r--r--ChangeLog16
-rw-r--r--NEWS4
-rwxr-xr-xconfigure38
-rw-r--r--configure.ac8
-rw-r--r--docs/plugins/html/gst-libav-plugins-plugin-libav.html2
-rw-r--r--docs/plugins/html/index.html2
-rw-r--r--docs/plugins/inspect/plugin-libav.xml2
-rw-r--r--gst-libav.doap10
-rw-r--r--gst-libav.spec2
9 files changed, 53 insertions, 31 deletions
diff --git a/ChangeLog b/ChangeLog
index ec7d347..b747e3f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,21 @@
+=== release 1.4.0 ===
+
+2014-07-19 Sebastian Dröge <slomo@coaxion.net>
+
+ * configure.ac:
+ releasing 1.4.0
+
=== release 1.3.91 ===
-2014-07-11 Sebastian Dröge <slomo@coaxion.net>
+2014-07-11 11:49:03 +0200 Sebastian Dröge <sebastian@centricular.com>
+ * ChangeLog:
+ * NEWS:
+ * RELEASE:
* configure.ac:
- releasing 1.3.91
+ * docs/plugins/inspect/plugin-libav.xml:
+ * gst-libav.doap:
+ Release 1.3.91
=== release 1.3.90 ===
diff --git a/NEWS b/NEWS
index b999b9b..a060925 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-This is GStreamer Libav Plugins 1.3.91
+This is GStreamer Libav Plugins 1.4.0
Changes since 1.2:
@@ -97,7 +97,7 @@ Major changes:
are available on OS X and iOS now.
• Other changes:
- ∘ gst-libav now uses libav 10.1, and gained support for H265/HEVC.
+ ∘ gst-libav now uses libav 10.2, and gained support for H265/HEVC.
∘ Support for hardware codecs and special memory types has been
improved with bugfixes and feature additions in various plugins
and base classes.
diff --git a/configure b/configure
index 436b0d1..fc2fe36 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.3.91.
+# Generated by GNU Autoconf 2.69 for GStreamer libav 1.4.0.
#
# 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.91'
-PACKAGE_STRING='GStreamer libav 1.3.91'
+PACKAGE_VERSION='1.4.0'
+PACKAGE_STRING='GStreamer libav 1.4.0'
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.91 to adapt to many kinds of systems.
+\`configure' configures GStreamer libav 1.4.0 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.91:";;
+ short | recursive ) echo "Configuration of GStreamer libav 1.4.0:";;
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.91
+GStreamer libav configure 1.4.0
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.91, which was
+It was created by GStreamer libav $as_me 1.4.0, 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.91'
+ VERSION='1.4.0'
cat >>confdefs.h <<_ACEOF
@@ -3338,9 +3338,9 @@ fi
- 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)
+ PACKAGE_VERSION_MAJOR=$(echo 1.4.0 | cut -d'.' -f1)
+ PACKAGE_VERSION_MINOR=$(echo 1.4.0 | cut -d'.' -f2)
+ PACKAGE_VERSION_MICRO=$(echo 1.4.0 | 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.91 | cut -d'.' -f4)
+ NANO=$(echo 1.4.0 | 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=391
+ GST_CURRENT=400
GST_REVISION=0
- GST_AGE=391
- GST_LIBVERSION=391:0:391
+ GST_AGE=400
+ GST_LIBVERSION=400:0:400
@@ -12331,8 +12331,8 @@ CC="$lt_save_CC"
-GST_REQ=1.3.91
-GST_PBREQ=1.3.91
+GST_REQ=1.4.0
+GST_PBREQ=1.4.0
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.91, which was
+This file was extended by GStreamer libav $as_me 1.4.0, 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.91
+GStreamer libav config.status 1.4.0
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index 1ed5f56..cda7d08 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.91,
+AC_INIT(GStreamer libav, 1.4.0,
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, 391, 0, 391)
+AS_LIBTOOL(GST, 400, 0, 400)
dnl *** required versions of GStreamer stuff ***
-GST_REQ=1.3.91
-GST_PBREQ=1.3.91
+GST_REQ=1.4.0
+GST_PBREQ=1.4.0
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 e9d69a3..2718368 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.91</td>
+<td>1.4.0</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 ea47087..7c1bbd7 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.91)
+ for GStreamer libav Plugins 1.0 (1.4.0)
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 31f8396..e252beb 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.91</version>
+ <version>1.4.0</version>
<license>GPL</license>
<source>gst-libav</source>
<package>libav</package>
diff --git a/gst-libav.doap b/gst-libav.doap
index 3e233a4..abe3434 100644
--- a/gst-libav.doap
+++ b/gst-libav.doap
@@ -34,6 +34,16 @@ colorspace conversion elements.
<release>
<Version>
+ <revision>1.4.0</revision>
+ <branch>1.4</branch>
+ <name></name>
+ <created>2014-07-19</created>
+ <file-release rdf:resource="http://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.4.0.tar.xz" />
+ </Version>
+ </release>
+
+ <release>
+ <Version>
<revision>1.3.91</revision>
<branch>1.3</branch>
<name></name>
diff --git a/gst-libav.spec b/gst-libav.spec
index e7b1ffb..345eeeb 100644
--- a/gst-libav.spec
+++ b/gst-libav.spec
@@ -4,7 +4,7 @@
%define gst_majorminor 1.0
Name: %{gstreamer}-libav
-Version: 1.3.91
+Version: 1.4.0
Release: 1
Summary: GStreamer Streaming-media framework plug-in using libav (FFmpeg).
Group: Libraries/Multimedia