diff options
| author | Sebastian Dröge <sebastian@centricular.com> | 2014-06-22 18:11:49 +0200 |
|---|---|---|
| committer | Sebastian Dröge <sebastian@centricular.com> | 2014-06-22 18:11:49 +0200 |
| commit | 03751800cf1e8ddaf7a4cdf467249741c6495630 (patch) | |
| tree | baa7b1975a50a929ab2a3eacc680bbbf107d9c30 | |
| parent | 2ed652f3552e59ad51a931d80eedec37a9d2c0fe (diff) | |
| parent | c679a0b89fb3b64fa40b589733ee22516f40d3a3 (diff) | |
Merge tag 'upstream/1.3.3' into debian-experimental
Upstream version 1.3.3
126 files changed, 321 insertions, 209 deletions
@@ -1,9 +1,123 @@ +=== release 1.3.3 === + +2014-06-22 Sebastian Dröge <slomo@coaxion.net> + + * configure.ac: + releasing 1.3.3 + +2014-06-22 14:25:18 +0200 Sebastian Dröge <sebastian@centricular.com> + + * po/de.po: + * po/nl.po: + po: Update translations + +2014-05-26 17:55:43 -0300 Thiago Santos <ts.santos@sisa.samsung.com> + + * gst/realmedia/rmdemux.c: + * gst/realmedia/rmdemux.h: + rmdemux: use GstFlowCombiner + Removes flow return combination code to use the newly added GstFlowCombiner + https://bugzilla.gnome.org/show_bug.cgi?id=709224 + +2014-05-23 18:17:11 -0300 Thiago Santos <ts.santos@sisa.samsung.com> + + * gst/asfdemux/gstasfdemux.c: + * gst/asfdemux/gstasfdemux.h: + asfdemux: use GstFlowCombiner + Removes flow return combination code to use the newly added GstFlowCombiner + https://bugzilla.gnome.org/show_bug.cgi?id=709224 + +2014-05-28 09:49:59 +0200 Aurélien Zanelli <aurelien.zanelli@parrot.com> + + * ext/x264/gstx264enc.c: + x264enc: fix caps leak in set_format() + https://bugzilla.gnome.org/show_bug.cgi?id=730865 + +2013-12-01 20:53:03 +0100 Matej Knopp <matej.knopp@gmail.com> + + * gst/asfdemux/gstasfdemux.c: + asfdemux: Handle initial 0 timestamp that should have been -1 + https://bugzilla.gnome.org/show_bug.cgi?id=719660 + +2014-05-21 13:23:33 +0200 Sebastian Dröge <sebastian@centricular.com> + + * configure.ac: + Back to development + === release 1.3.2 === -2014-05-21 Sebastian Dröge <slomo@coaxion.net> +2014-05-21 13:06:35 +0200 Sebastian Dröge <sebastian@centricular.com> + * ChangeLog: + * NEWS: + * RELEASE: + * common: * configure.ac: - releasing 1.3.2 + * docs/plugins/inspect-build.stamp: + * docs/plugins/inspect.stamp: + * 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-mad.xml: + * docs/plugins/inspect/plugin-mpeg2dec.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: + * win32/common/config.h: + Release 1.3.2 + +2014-05-21 12:53:52 +0200 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/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 2014-05-21 10:51:38 +0200 Sebastian Dröge <sebastian@centricular.com> @@ -1,4 +1,4 @@ -This is GStreamer Ugly Plugins 1.3.2 +This is GStreamer Ugly Plugins 1.3.3 Changes since 1.2: @@ -30,6 +30,10 @@ New API: caps. • GstCollectPads has support for flushing and a default handler for SEEK events now. + • New GstFlowAggregator helper object that simplifies handling of + flow returns in elements with multiple source pads. Additionally + GstPad now always stores the last flow return and provides an + API to retrieve it. • GstSegment has new API to offset the running time by a specific value and this is used in GstPad to allow positive and negative offsets in gst_pad_set_offset() in all situations. @@ -43,6 +47,7 @@ New API: • Support for tiled, raw video formats has been added. • GstVideoDecoder and GstAudioDecoder have API to help aggregating tag events and merge custom tags into them consistently. + • GstBufferPool has support for flushing now. • playbin/playsink has support for application provided audio and video filters. • GstDiscoverer has new and simplified API to get details about missing @@ -54,6 +59,10 @@ New API: DispManX (Raspberry Pi), EAGL (iOS), WGL (Windows) and generic X11, Wayland and EGL platforms. This replaces eglglessink and also is supposed to replace osxvideosink. + • New GstAggregator base class in gst-plugins-bad. This is supposed to + replace GstCollectPads in the future and fix long-known shortcomings + in its API. Together with the base class some elements are provided + already, like a videomixer (compositor). Major changes: @@ -97,7 +106,8 @@ Major changes: ∘ dvbsrc supports more delivery mechanisms and other features now, including DVB S2 and T2 support. ∘ The MPEGTS library has support for many more descriptors. - ∘ Major improvements to tsdemux, especially time related. + ∘ Major improvements to tsdemux and tsparse, especially time and + seeking related. ∘ souphttpsrc now has support for keep-alive connections, compression, configurable number of retries and configuration for SSL certificate validation. @@ -110,9 +120,16 @@ Major changes: finish. ∘ videoflip can automatically flip based on the orientation tag. ∘ openjpeg supports the OpenJPEG2 API. + ∘ waylandsink was refactored and should be more useful now. It also + includes a small library which most likely is going to be removed + in the future and will result in extensions to the GstVideoOverlay + interface. ∘ gst-rtsp-server supports SRTP and MIKEY now. + ∘ gst-libav encoders are now negotiating any profile/level settings + with downstream via caps. ∘ Lots of fixes for coverity warnings all over the place. - ∘ 400+ fixed bug reports, and many other bug fixes and other + ∘ Negotiation related performance improvements. + ∘ 500+ fixed bug reports, and many other bug fixes and other improvements everywhere that had no bug report. Things to look out for: @@ -120,3 +137,5 @@ Things to look out for: element. • The mfcdec element was removed and replaced by v4l2videodec. • osxvideosink is only available in OS X 10.6 or newer. + • The GstDeviceMonitor API will likely change slightly before the + 1.4.0 release. @@ -1,8 +1,8 @@ -Release notes for GStreamer Ugly Plugins 1.3.2 +Release notes for GStreamer Ugly Plugins 1.3.3 -The GStreamer team is pleased to announce the second release of the unstable +The GStreamer team is pleased to announce the third release of the unstable 1.3 release series. The 1.3 release series is adding new features on top of the 1.0 and 1.2 series and is part of the API and ABI-stable 1.x release series of the GStreamer multimedia framework. The unstable 1.3 release series @@ -10,23 +10,15 @@ will lead to the stable 1.4 release series in the next weeks, and newly added API can still change until that point. +This is hopefully the last 1.3 development release and will be followed by +the first 1.4.0 release candidate (1.3.90) in 1-2 weeks. Which then hopefully +is followed by 1.4.0 soonish in early July. + Binaries for Android, iOS, Mac OS X and Windows will be provided separately during the unstable 1.3 release series. - -The versioning scheme that is used in general is that 1.x.y is API and -ABI backwards compatible with previous 1.x.y releases. If x is an even -number it is a stable release series and all releases in this series -will only contain important bugfixes, e.g. the 1.0 series with 1.0.7. If -x is odd it is a development release series that will lead to the next -stable release series 1.x+1 and contains new features and bigger -changes. During the development release series, new API can still -change. - - - "When you have to shoot, shoot. Don't talk." @@ -70,8 +62,10 @@ contains a set of codecs plugins based on libav (formerly gst-ffmpeg) -There were no bugs fixed in this release - +Bugs fixed in this release + + * 719660 : asfdemux: some dvr-ms files don't play + * 730865 : x264enc: fix caps leak in set_format() ==== Download ==== @@ -108,7 +102,8 @@ subscribe to the gstreamer-devel list. Contributors to this release - * Edward Hervey + * Aurélien Zanelli + * Matej Knopp * Sebastian Dröge - * Tim-Philipp Müller + * Thiago Santos
\ No newline at end of file @@ -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.3.2. +# Generated by GNU Autoconf 2.69 for GStreamer Ugly Plug-ins 1.3.3. # # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer>. # @@ -591,8 +591,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='GStreamer Ugly Plug-ins' PACKAGE_TARNAME='gst-plugins-ugly' -PACKAGE_VERSION='1.3.2' -PACKAGE_STRING='GStreamer Ugly Plug-ins 1.3.2' +PACKAGE_VERSION='1.3.3' +PACKAGE_STRING='GStreamer Ugly Plug-ins 1.3.3' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer' PACKAGE_URL='' @@ -1647,7 +1647,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 Ugly Plug-ins 1.3.2 to adapt to many kinds of systems. +\`configure' configures GStreamer Ugly Plug-ins 1.3.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1719,7 +1719,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of GStreamer Ugly Plug-ins 1.3.2:";; + short | recursive ) echo "Configuration of GStreamer Ugly Plug-ins 1.3.3:";; esac cat <<\_ACEOF @@ -1950,7 +1950,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -GStreamer Ugly Plug-ins configure 1.3.2 +GStreamer Ugly Plug-ins configure 1.3.3 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2856,7 +2856,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 Ugly Plug-ins $as_me 1.3.2, which was +It was created by GStreamer Ugly Plug-ins $as_me 1.3.3, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3835,7 +3835,7 @@ fi # Define the identity of the package. PACKAGE='gst-plugins-ugly' - VERSION='1.3.2' + VERSION='1.3.3' cat >>confdefs.h <<_ACEOF @@ -4046,9 +4046,9 @@ fi - PACKAGE_VERSION_MAJOR=$(echo 1.3.2 | cut -d'.' -f1) - PACKAGE_VERSION_MINOR=$(echo 1.3.2 | cut -d'.' -f2) - PACKAGE_VERSION_MICRO=$(echo 1.3.2 | cut -d'.' -f3) + PACKAGE_VERSION_MAJOR=$(echo 1.3.3 | cut -d'.' -f1) + PACKAGE_VERSION_MINOR=$(echo 1.3.3 | cut -d'.' -f2) + PACKAGE_VERSION_MICRO=$(echo 1.3.3 | cut -d'.' -f3) @@ -4059,7 +4059,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking nano version" >&5 $as_echo_n "checking nano version... " >&6; } - NANO=$(echo 1.3.2 | cut -d'.' -f4) + NANO=$(echo 1.3.3 | cut -d'.' -f4) if test x"$NANO" = x || test "x$NANO" = "x0" ; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: 0 (release)" >&5 @@ -8708,10 +8708,10 @@ fi done - GST_CURRENT=302 + GST_CURRENT=303 GST_REVISION=0 - GST_AGE=302 - GST_LIBVERSION=302:0:302 + GST_AGE=303 + GST_LIBVERSION=303:0:303 @@ -13036,8 +13036,8 @@ CC="$lt_save_CC" -GST_REQ=1.3.2 -GSTPB_REQ=1.3.2 +GST_REQ=1.3.3 +GSTPB_REQ=1.3.3 @@ -28109,7 +28109,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 Ugly Plug-ins $as_me 1.3.2, which was +This file was extended by GStreamer Ugly Plug-ins $as_me 1.3.3, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -28175,7 +28175,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 Ugly Plug-ins config.status 1.3.2 +GStreamer Ugly Plug-ins config.status 1.3.3 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 304c433..715ce0e 100644 --- a/configure.ac +++ b/configure.ac @@ -5,7 +5,7 @@ dnl please read gstreamer/docs/random/autotools before changing this file 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.3.2],[http://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer],[gst-plugins-ugly]) +AC_INIT([GStreamer Ugly Plug-ins],[1.3.3],[http://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer],[gst-plugins-ugly]) AG_GST_INIT @@ -42,11 +42,11 @@ AC_SUBST(GST_API_VERSION) AC_DEFINE_UNQUOTED(GST_API_VERSION, "$GST_API_VERSION", [GStreamer API Version]) -AS_LIBTOOL(GST, 302, 0, 302) +AS_LIBTOOL(GST, 303, 0, 303) dnl *** required versions of GStreamer stuff *** -GST_REQ=1.3.2 -GSTPB_REQ=1.3.2 +GST_REQ=1.3.3 +GSTPB_REQ=1.3.3 dnl *** autotools stuff **** 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 0f159b9..247318b 100644 --- a/docs/plugins/html/gst-plugins-ugly-plugins-plugin-a52dec.html +++ b/docs/plugins/html/gst-plugins-ugly-plugins-plugin-a52dec.html @@ -42,7 +42,7 @@ </tr> <tr> <td><p><span class="term">version</span></p></td> -<td>1.3.2</td> +<td>1.3.3</td> </tr> <tr> <td><p><span class="term">run-time license</span></p></td> 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 80632b5..cc088f0 100644 --- a/docs/plugins/html/gst-plugins-ugly-plugins-plugin-amrnb.html +++ b/docs/plugins/html/gst-plugins-ugly-plugins-plugin-amrnb.html @@ -42,7 +42,7 @@ </tr> <tr> <td><p><span class="term">version</span></p></td> -<td>1.3.2</td> +<td>1.3.3</td> </tr> <tr> <td><p><span class="term">run-time license</span></p></td> 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 8aa3bfc..e47648e 100644 --- a/docs/plugins/html/gst-plugins-ugly-plugins-plugin-amrwbdec.html +++ b/docs/plugins/html/gst-plugins-ugly-plugins-plugin-amrwbdec.html @@ -42,7 +42,7 @@ </tr> <tr> <td><p><span class="term">version</span></p></td> -<td>1.3.2</td> +<td>1.3.3</td> </tr> <tr> <td><p><span class="term">run-time license</span></p></td> 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 2ef0b49..6266055 100644 --- a/docs/plugins/html/gst-plugins-ugly-plugins-plugin-asf.html +++ b/docs/plugins/html/gst-plugins-ugly-plugins-plugin-asf.html @@ -42,7 +42,7 @@ </tr> <tr> <td><p><span class="term">version</span></p></td> -<td>1.3.2</td> +<td>1.3.3</td> </tr> <tr> <td><p><span class="term">run-time license</span></p></td> 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 b3e9d7c..c62d597 100644 --- a/docs/plugins/html/gst-plugins-ugly-plugins-plugin-cdio.html +++ b/docs/plugins/html/gst-plugins-ugly-plugins-plugin-cdio.html @@ -42,7 +42,7 @@ </tr> <tr> <td><p><span class="term">version</span></p></td> -<td>1.3.2</td> +<td>1.3.3</td> </tr> <tr> <td><p><span class="term">run-time license</span></p></td> 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 851d759..d247366 100644 --- a/docs/plugins/html/gst-plugins-ugly-plugins-plugin-dvdlpcmdec.html +++ b/docs/plugins/html/gst-plugins-ugly-plugins-plugin-dvdlpcmdec.html @@ -42,7 +42,7 @@ </tr> <tr> <td><p><span class="term">version</span></p></td> -<td>1.3.2</td> +<td>1.3.3</td> </tr> <tr> <td><p><span class="term">run-time license</span></p></td> 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 7bc7a06..ec23ecb 100644 --- a/docs/plugins/html/gst-plugins-ugly-plugins-plugin-dvdread.html +++ b/docs/plugins/html/gst-plugins-ugly-plugins-plugin-dvdread.html @@ -42,7 +42,7 @@ </tr> <tr> <td><p><span class="term">version</span></p></td> -<td>1.3.2</td> +<td>1.3.3</td> </tr> <tr> <td><p><span class="term">run-time license</span></p></td> 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 b7f2272..00c6559 100644 --- a/docs/plugins/html/gst-plugins-ugly-plugins-plugin-dvdsub.html +++ b/docs/plugins/html/gst-plugins-ugly-plugins-plugin-dvdsub.html @@ -42,7 +42,7 @@ </tr> <tr> <td><p><span class="term">version</span></p></td> -<td>1.3.2</td> +<td>1.3.3</td> </tr> <tr> <td><p><span class="term">run-time license</span></p></td> diff --git a/docs/plugins/html/gst-plugins-ugly-plugins-plugin-lame.html b/docs/plugins/html/gst-plugins-ugly-plugins-plugin-lame.html index e1322e3..7791b79 100644 --- a/docs/plugins/html/gst-plugins-ugly-plugins-plugin-lame.html +++ b/docs/plugins/html/gst-plugins-ugly-plugins-plugin-lame.html @@ -42,7 +42,7 @@ </tr> <tr> <td><p><span class="term">version</span></p></td> -<td>1.3.2</td> +<td>1.3.3</td> </tr> <tr> <td><p><span class="term">run-time license</span></p></td> diff --git a/docs/plugins/html/gst-plugins-ugly-plugins-plugin-mad.html b/docs/plugins/html/gst-plugins-ugly-plugins-plugin-mad.html index 36cc5ae..3bf3452 100644 --- a/docs/plugins/html/gst-plugins-ugly-plugins-plugin-mad.html +++ b/docs/plugins/html/gst-plugins-ugly-plugins-plugin-mad.html @@ -42,7 +42,7 @@ </tr> <tr> <td><p><span class="term">version</span></p></td> -<td>1.3.2</td> +<td>1.3.3</td> </tr> <tr> <td><p><span class="term">run-time license</span></p></td> 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 049d349..5cad0ea 100644 --- a/docs/plugins/html/gst-plugins-ugly-plugins-plugin-mpeg2dec.html +++ b/docs/plugins/html/gst-plugins-ugly-plugins-plugin-mpeg2dec.html @@ -42,7 +42,7 @@ </tr> <tr> <td><p><span class="term">version</span></p></td> -<td>1.3.2</td> +<td>1.3.3</td> </tr> <tr> <td><p><span class="term">run-time license</span></p></td> 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 d5ec47a..b2ebf25 100644 --- a/docs/plugins/html/gst-plugins-ugly-plugins-plugin-realmedia.html +++ b/docs/plugins/html/gst-plugins-ugly-plugins-plugin-realmedia.html @@ -42,7 +42,7 @@ </tr> <tr> <td><p><span class="term">version</span></p></td> -<td>1.3.2</td> +<td>1.3.3</td> </tr> <tr> <td><p><span class="term">run-time license</span></p></td> diff --git a/docs/plugins/html/gst-plugins-ugly-plugins-plugin-siddec.html b/docs/plugins/html/gst-plugins-ugly-plugins-plugin-siddec.html index ab434a4..5e393a5 100644 --- a/docs/plugins/html/gst-plugins-ugly-plugins-plugin-siddec.html +++ b/docs/plugins/html/gst-plugins-ugly-plugins-plugin-siddec.html @@ -42,7 +42,7 @@ </tr> <tr> <td><p><span class="term">version</span></p></td> -<td>1.3.2</td> +<td>1.3.3</td> </tr> <tr> <td><p><span class="term">run-time license</span></p></td> diff --git a/docs/plugins/html/gst-plugins-ugly-plugins-plugin-twolame.html b/docs/plugins/html/gst-plugins-ugly-plugins-plugin-twolame.html index 9421b26..b787065 100644 --- a/docs/plugins/html/gst-plugins-ugly-plugins-plugin-twolame.html +++ b/docs/plugins/html/gst-plugins-ugly-plugins-plugin-twolame.html @@ -42,7 +42,7 @@ </tr> <tr> <td><p><span class="term">version</span></p></td> -<td>1.3.2</td> +<td>1.3.3</td> </tr> <tr> <td><p><span class="term">run-time license</span></p></td> 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 be9de51..f8c1779 100644 --- a/docs/plugins/html/gst-plugins-ugly-plugins-plugin-x264.html +++ b/docs/plugins/html/gst-plugins-ugly-plugins-plugin-x264.html @@ -41,7 +41,7 @@ </tr> <tr> <td><p><span class="term">version</span></p></td> -<td>1.3.2</td> +<td>1.3.3</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 7dbf6c2..ed49fa1 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 Ugly Plugins 1.0 Plugins Reference Manual</p></th></tr></table></div> <div><p class="releaseinfo"> - for GStreamer Ugly Plugins 1.0 (1.3.2) + for GStreamer Ugly Plugins 1.0 (1.3.3) 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> diff --git a/docs/plugins/inspect/plugin-a52dec.xml b/docs/plugins/inspect/plugin-a52dec.xml index 9228329..6dcaff4 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.3.2</version> + <version>1.3.3</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 6746607..da561bc 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.3.2</version> + <version>1.3.3</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 eca0a2e..bce6b44 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.3.2</version> + <version>1.3.3</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 94ab751..d5442df 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.3.2</version> + <version>1.3.3</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 5d56569..e333953 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.3.2</version> + <version>1.3.3</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 9610c40..528ccdc 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.3.2</version> + <version>1.3.3</version> <license>LGPL</license> <source>gst-plugins-ugly</source> <package>GStreamer Ugly Plug-ins source release</package> diff --git a/docs/plugins/inspect/plugin-dvdread.xml b/docs/plugins/inspect/plugin-dvdread.xml index 77d27a0..a29da6b 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.3.2</version> + <version>1.3.3</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 74a3a55..39b0b16 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.3.2</version> + <version>1.3.3</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 index b2842f3..af29ba4 100644 --- a/docs/plugins/inspect/plugin-lame.xml +++ b/docs/plugins/inspect/plugin-lame.xml @@ -3,7 +3,7 @@ <description>Encode MP3s with LAME</description> <filename>../../ext/lame/.libs/libgstlame.so</filename> <basename>libgstlame.so</basename> - <version>1.3.2</version> + <version>1.3.3</version> <license>LGPL</license> <source>gst-plugins-ugly</source> <package>GStreamer Ugly Plug-ins source release</package> diff --git a/docs/plugins/inspect/plugin-mad.xml b/docs/plugins/inspect/plugin-mad.xml index 7f1088e..74ea16f 100644 --- a/docs/plugins/inspect/plugin-mad.xml +++ b/docs/plugins/inspect/plugin-mad.xml @@ -3,7 +3,7 @@ <description>mp3 decoding based on the mad library</description> <filename>../../ext/mad/.libs/libgstmad.so</filename> <basename>libgstmad.so</basename> - <version>1.3.2</version> + <version>1.3.3</version> <license>GPL</license> <source>gst-plugins-ugly</source> <package>GStreamer Ugly Plug-ins source release</package> diff --git a/docs/plugins/inspect/plugin-mpeg2dec.xml b/docs/plugins/inspect/plugin-mpeg2dec.xml index 065ca8c..d34f3ce 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.3.2</version> + <version>1.3.3</version> <license>GPL</license> <source>gst-plugins-ugly</source> <package>GStreamer Ugly Plug-ins source release</package> diff --git a/docs/plugins/inspect/plugin-realmedia.xml b/docs/plugins/inspect/plugin-realmedia.xml index 94f28a1..3b9a7d0 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/libgstrmdemux.so</filename> <basename>libgstrmdemux.so</basename> - <version>1.3.2</version> + <version>1.3.3</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-siddec.xml index 411ff5b..b706be5 100644 --- a/docs/plugins/inspect/plugin-siddec.xml +++ b/docs/plugins/inspect/plugin-siddec.xml @@ -3,7 +3,7 @@ <description>Uses libsidplay to decode .sid files</description> <filename>../../ext/sidplay/.libs/libgstsid.so</filename> <basename>libgstsid.so</basename> - <version>1.3.2</version> + <version>1.3.3</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 index 014c20d..157d998 100644 --- a/docs/plugins/inspect/plugin-twolame.xml +++ b/docs/plugins/inspect/plugin-twolame.xml @@ -3,7 +3,7 @@ <description>Encode MP2s with TwoLAME</description> <filename>../../ext/twolame/.libs/libgsttwolame.so</filename> <basename>libgsttwolame.so</basename> - <version>1.3.2</version> + <version>1.3.3</version> <license>LGPL</license> <source>gst-plugins-ugly</source> <package>GStreamer Ugly Plug-ins source release</package> diff --git a/docs/plugins/inspect/plugin-x264.xml b/docs/plugins/inspect/plugin-x264.xml index 18b142f..b38da3f 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.3.2</version> + <version>1.3.3</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 e610acd..4a2c0f6 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.3.2</version> + <version>1.3.3</version> <license>LGPL</license> <source>gst-plugins-ugly</source> <package>GStreamer Ugly Plug-ins source release</package> diff --git a/ext/x264/gstx264enc.c b/ext/x264/gstx264enc.c index 61e7698..3d81d96 100644 --- a/ext/x264/gstx264enc.c +++ b/ext/x264/gstx264enc.c @@ -1804,6 +1804,7 @@ gst_x264_enc_set_format (GstVideoEncoder * video_enc, if (gst_caps_is_empty (allowed_caps)) { gst_caps_unref (allowed_caps); + gst_caps_unref (template_caps); return FALSE; } diff --git a/gst-plugins-ugly.doap b/gst-plugins-ugly.doap index ede7d93..8033e66 100644 --- a/gst-plugins-ugly.doap +++ b/gst-plugins-ugly.doap @@ -35,6 +35,16 @@ might be widely known to present patent problems. <release> <Version> + <revision>1.3.3</revision> + <branch>1.3</branch> + <name></name> + <created>2014-06-22</created> + <file-release rdf:resource="http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.3.3.tar.xz" /> + </Version> + </release> + + <release> + <Version> <revision>1.3.2</revision> <branch>1.3</branch> <name></name> diff --git a/gst-plugins-ugly.spec b/gst-plugins-ugly.spec index 867a0db..bb36cc8 100644 --- a/gst-plugins-ugly.spec +++ b/gst-plugins-ugly.spec @@ -4,7 +4,7 @@ %define gst_minver 0.11.0 Name: %{gstreamer}-plugins-ugly -Version: 1.3.2 +Version: 1.3.3 Release: 1.gst Summary: GStreamer streaming media framework "ugly" plug-ins diff --git a/gst/asfdemux/gstasfdemux.c b/gst/asfdemux/gstasfdemux.c index 07a6a71..52d849d 100644 --- a/gst/asfdemux/gstasfdemux.c +++ b/gst/asfdemux/gstasfdemux.c @@ -148,9 +148,10 @@ gst_asf_demux_free_stream (GstASFDemux * demux, AsfStream * stream) stream->pending_tags = NULL; } if (stream->pad) { - if (stream->active) + if (stream->active) { gst_element_remove_pad (GST_ELEMENT_CAST (demux), stream->pad); - else + gst_flow_combiner_remove_pad (demux->flowcombiner, stream->pad); + } else gst_object_unref (stream->pad); stream->pad = NULL; } @@ -524,7 +525,6 @@ gst_asf_demux_reset_stream_state_after_discont (GstASFDemux * demux) for (n = 0; n < demux->num_streams; n++) { demux->stream[n].discont = TRUE; - demux->stream[n].last_flow = GST_FLOW_OK; while (demux->stream[n].payloads->len > 0) { AsfPayload *payload; @@ -965,36 +965,6 @@ parse_failed: } } -static GstFlowReturn -gst_asf_demux_aggregate_flow_return (GstASFDemux * demux, AsfStream * stream, - GstFlowReturn flow) -{ - int i; - - GST_DEBUG_OBJECT (demux, "Aggregating"); - - /* Store the value */ - stream->last_flow = flow; - - /* any other error that is not not-linked can be returned right away */ - if (flow != GST_FLOW_NOT_LINKED) - goto done; - - for (i = 0; i < demux->num_streams; i++) { - if (demux->stream[i].active) { - flow = demux->stream[i].last_flow; - GST_DEBUG_OBJECT (demux, "Aggregating: flow %i return %s", i, - gst_flow_get_name (flow)); - if (flow != GST_FLOW_NOT_LINKED) - goto done; - } - } - - /* If we got here, then all our active streams are not linked */ -done: - return flow; -} - static gboolean gst_asf_demux_pull_data (GstASFDemux * demux, guint64 offset, guint size, GstBuffer ** p_buf, GstFlowReturn * p_flow) @@ -1346,16 +1316,36 @@ gst_asf_demux_check_first_ts (GstASFDemux * demux, gboolean force) AsfStream *stream; int j; GstClockTime stream_min_ts = GST_CLOCK_TIME_NONE; + GstClockTime stream_min_ts2 = GST_CLOCK_TIME_NONE; /* second smallest timestamp */ stream = &demux->stream[i]; for (j = 0; j < stream->payloads->len; ++j) { AsfPayload *payload = &g_array_index (stream->payloads, AsfPayload, j); if (GST_CLOCK_TIME_IS_VALID (payload->ts) && (!GST_CLOCK_TIME_IS_VALID (stream_min_ts) - || stream_min_ts > payload->ts)) + || stream_min_ts > payload->ts)) { stream_min_ts = payload->ts; + } + if (GST_CLOCK_TIME_IS_VALID (payload->ts) && + payload->ts > stream_min_ts && + (!GST_CLOCK_TIME_IS_VALID (stream_min_ts2) + || stream_min_ts2 > payload->ts)) { + stream_min_ts2 = payload->ts; + } } + /* there are some DVR ms files where first packet has TS of 0 (instead of -1) while subsequent packets have + regular (singificantly larger) timestamps. If we don't deal with it, we may end up with huge gap in timestamps + which makes playback stuck. The 0 timestamp may also be valid though, if the second packet timestamp continues + 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; + + 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; @@ -1721,7 +1711,7 @@ gst_asf_demux_push_complete_payloads (GstASFDemux * demux, gboolean force) if (stream->active) { ret = gst_pad_push (stream->pad, payload->buf); - ret = gst_asf_demux_aggregate_flow_return (demux, stream, ret); + ret = gst_flow_combiner_update_flow (demux->flowcombiner, ret); } else { gst_buffer_unref (payload->buf); ret = GST_FLOW_OK; @@ -2582,6 +2572,7 @@ gst_asf_demux_activate_stream (GstASFDemux * demux, AsfStream * stream) gst_pad_set_caps (stream->pad, stream->caps); gst_element_add_pad (GST_ELEMENT_CAST (demux), stream->pad); + gst_flow_combiner_add_pad (demux->flowcombiner, stream->pad); stream->active = TRUE; } } @@ -4343,6 +4334,7 @@ gst_asf_demux_change_state (GstElement * element, GstStateChange transition) demux->data_offset = 0; demux->index_offset = 0; demux->base_offset = 0; + demux->flowcombiner = gst_flow_combiner_new (); break; } default: @@ -4355,8 +4347,13 @@ gst_asf_demux_change_state (GstElement * element, GstStateChange transition) switch (transition) { case GST_STATE_CHANGE_PAUSED_TO_READY: + gst_asf_demux_reset (demux, FALSE); + break; + case GST_STATE_CHANGE_READY_TO_NULL: gst_asf_demux_reset (demux, FALSE); + gst_flow_combiner_free (demux->flowcombiner); + demux->flowcombiner = NULL; break; default: break; diff --git a/gst/asfdemux/gstasfdemux.h b/gst/asfdemux/gstasfdemux.h index 96ee638..46e1e13 100644 --- a/gst/asfdemux/gstasfdemux.h +++ b/gst/asfdemux/gstasfdemux.h @@ -23,6 +23,7 @@ #include <gst/gst.h> #include <gst/base/gstadapter.h> +#include <gst/base/gstflowcombiner.h> #include "asfheaders.h" @@ -106,7 +107,6 @@ typedef struct guint16 ds_data_size; /* for new parsing code */ - GstFlowReturn last_flow; /* last flow return */ GArray *payloads; /* pending payloads */ /* Video stream PAR & interlacing */ @@ -168,6 +168,7 @@ struct _GstASFDemux { guint32 num_streams; AsfStream stream[GST_ASF_DEMUX_NUM_STREAMS]; gboolean activated_streams; + GstFlowCombiner *flowcombiner; /* for chained asf handling, we need to hold the old asf streams until * we detect the new ones */ diff --git a/gst/realmedia/rmdemux.c b/gst/realmedia/rmdemux.c index 2340a05..d4afae4 100644 --- a/gst/realmedia/rmdemux.c +++ b/gst/realmedia/rmdemux.c @@ -55,7 +55,6 @@ struct _GstRMDemuxStream int id; GstPad *pad; - GstFlowReturn last_flow; gboolean discont; int timescale; @@ -238,6 +237,10 @@ gst_rmdemux_finalize (GObject * object) g_object_unref (rmdemux->adapter); rmdemux->adapter = NULL; } + if (rmdemux->flowcombiner) { + gst_flow_combiner_free (rmdemux->flowcombiner); + rmdemux->flowcombiner = NULL; + } GST_CALL_PARENT (G_OBJECT_CLASS, finalize, (object)); } @@ -264,6 +267,7 @@ gst_rmdemux_init (GstRMDemux * rmdemux) rmdemux->need_newsegment = TRUE; rmdemux->have_group_id = FALSE; rmdemux->group_id = G_MAXUINT; + rmdemux->flowcombiner = gst_flow_combiner_new (); gst_rm_utils_run_tests (); } @@ -688,6 +692,7 @@ gst_rmdemux_reset (GstRMDemux * rmdemux) g_object_unref (stream->adapter); gst_rmdemux_stream_clear_cached_subpackets (rmdemux, stream); + gst_flow_combiner_remove_pad (rmdemux->flowcombiner, stream->pad); gst_element_remove_pad (GST_ELEMENT (rmdemux), stream->pad); if (stream->pending_tags) gst_tag_list_unref (stream->pending_tags); @@ -1294,7 +1299,6 @@ gst_rmdemux_send_event (GstRMDemux * rmdemux, GstEvent * event) stream->next_ts = -1; stream->last_seq = -1; stream->next_seq = -1; - stream->last_flow = GST_FLOW_OK; break; default: break; @@ -1557,6 +1561,7 @@ gst_rmdemux_add_stream (GstRMDemux * rmdemux, GstRMDemuxStream * stream) g_free (codec_name); } gst_element_add_pad (GST_ELEMENT_CAST (rmdemux), stream->pad); + gst_flow_combiner_add_pad (rmdemux->flowcombiner, stream->pad); } beach: @@ -1627,7 +1632,6 @@ gst_rmdemux_parse_mdpr (GstRMDemux * rmdemux, const guint8 * data, int length) stream->seek_offset = 0; stream->last_ts = -1; stream->next_ts = -1; - stream->last_flow = GST_FLOW_OK; stream->discont = TRUE; stream->adapter = gst_adapter_new (); GST_LOG_OBJECT (rmdemux, "stream_number=%d", stream->id); @@ -1924,39 +1928,6 @@ gst_rmdemux_parse_cont (GstRMDemux * rmdemux, const guint8 * data, int length) gst_tag_list_merge (rmdemux->pending_tags, tags, GST_TAG_MERGE_APPEND); } -static GstFlowReturn -gst_rmdemux_combine_flows (GstRMDemux * rmdemux, GstRMDemuxStream * stream, - GstFlowReturn ret) -{ - GSList *cur; - - /* store the value */ - stream->last_flow = ret; - - /* if it's success we can return the value right away */ - if (ret == GST_FLOW_OK) - goto done; - - /* any other error that is not-linked can be returned right - * away */ - if (ret != GST_FLOW_NOT_LINKED) - goto done; - - for (cur = rmdemux->streams; cur; cur = cur->next) { - GstRMDemuxStream *ostream = cur->data; - - ret = ostream->last_flow; - /* some other return value (must be SUCCESS but we can return - * other values as well) */ - if (ret != GST_FLOW_NOT_LINKED) - goto done; - } - /* if we get here, all other pads were unlinked and we return - * NOT_LINKED then */ -done: - return ret; -} - static void gst_rmdemux_stream_clear_cached_subpackets (GstRMDemux * rmdemux, GstRMDemuxStream * stream) @@ -2238,7 +2209,7 @@ gst_rmdemux_parse_video_packet (GstRMDemux * rmdemux, GstRMDemuxStream * stream, /* if size <= 2, we want this method to return the same GstFlowReturn as it * was previously for that given stream. */ - ret = stream->last_flow; + ret = GST_PAD_LAST_FLOW_RETURN (stream->pad); while (size > 2) { guint8 pkg_header; @@ -2404,7 +2375,7 @@ gst_rmdemux_parse_video_packet (GstRMDemux * rmdemux, GstRMDemuxStream * stream, } ret = gst_pad_push (stream->pad, out); - ret = gst_rmdemux_combine_flows (rmdemux, stream, ret); + ret = gst_flow_combiner_update_flow (rmdemux->flowcombiner, ret); if (ret != GST_FLOW_OK) break; @@ -2591,7 +2562,7 @@ gst_rmdemux_parse_packet (GstRMDemux * rmdemux, GstBuffer * in, guint16 version) ret = GST_FLOW_OK; } - cret = gst_rmdemux_combine_flows (rmdemux, stream, ret); + cret = gst_flow_combiner_update_flow (rmdemux->flowcombiner, ret); beach: return cret; diff --git a/gst/realmedia/rmdemux.h b/gst/realmedia/rmdemux.h index 25e40bb..68a1700 100644 --- a/gst/realmedia/rmdemux.h +++ b/gst/realmedia/rmdemux.h @@ -23,6 +23,7 @@ #include <gst/gst.h> #include <gst/base/gstadapter.h> +#include <gst/base/gstflowcombiner.h> #include <gst/pbutils/descriptions.h> G_BEGIN_DECLS @@ -91,6 +92,8 @@ struct _GstRMDemux { GstAdapter *adapter; gboolean have_pads; + GstFlowCombiner *flowcombiner; + guint32 timescale; guint64 duration; guint32 avg_packet_size; Binary files differ@@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gst-plugins 0.7.6\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2014-05-21 12:49+0200\n" +"POT-Creation-Date: 2014-06-22 17:39+0200\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" Binary files differ@@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gst-plugins-0.8.0\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2014-05-21 12:49+0200\n" +"POT-Creation-Date: 2014-06-22 17:39+0200\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" Binary files differ@@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: gst-plugins-ugly 0.10.17.2\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2014-05-21 12:49+0200\n" +"POT-Creation-Date: 2014-06-22 17:39+0200\n" "PO-Revision-Date: 2011-04-26 22:34+0300\n" "Last-Translator: Alexander Shopov <ash@kambanaria.org>\n" "Language-Team: Bulgarian <dict@fsa-bg.org>\n" Binary files differ@@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: gst-plugins-ugly 0.10.17.2\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2014-05-21 12:49+0200\n" +"POT-Creation-Date: 2014-06-22 17:39+0200\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" Binary files differ@@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: gst-plugins-ugly 1.0.3\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2014-05-21 12:49+0200\n" +"POT-Creation-Date: 2014-06-22 17:39+0200\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" Binary files differ@@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: gst-plugins-ugly-1.0.3\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2014-05-21 12:49+0200\n" +"POT-Creation-Date: 2014-06-22 17:39+0200\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" Binary files differ@@ -1,4 +1,4 @@ -# German translations for gst-plugins-ugly 1.1.4 +# German translations for gst-plugins-ugly 1.3.2 # Copyright (C) 2009 Free Software Foundation, Inc. # This file is distributed under the same license as the gst-plugins-ugly package. # @@ -11,10 +11,10 @@ # msgid "" msgstr "" -"Project-Id-Version: gst-plugins-ugly 1.1.4\n" +"Project-Id-Version: gst-plugins-ugly 1.3.2\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2014-05-21 12:49+0200\n" -"PO-Revision-Date: 2013-09-21 14:25+0100\n" +"POT-Creation-Date: 2014-06-22 17:39+0200\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" "Language: de\n" @@ -22,6 +22,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Poedit 1.5.4\n" msgid "Could not read from CD." msgstr "Von der CD konnte nicht gelesen werden." Binary files differ@@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: gst-plugins-ugly 0.10.17.2\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2014-05-21 12:49+0200\n" +"POT-Creation-Date: 2014-06-22 17:39+0200\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" diff --git a/po/en_GB.gmo b/po/en_GB.gmo Binary files differindex 97c2db5..5a876f0 100644 --- a/po/en_GB.gmo +++ b/po/en_GB.gmo diff --git a/po/en_GB.po b/po/en_GB.po index 9997ada..02683e1 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: gst-plugins 0.8.1\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2014-05-21 12:49+0200\n" +"POT-Creation-Date: 2014-06-22 17:39+0200\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" Binary files differ@@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gst-plugins-ugly 0.10.17.2\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2014-05-21 12:49+0200\n" +"POT-Creation-Date: 2014-06-22 17:39+0200\n" "PO-Revision-Date: 2011-06-04 22:24+0200\n" "Last-Translator: Kristjan SCHMIDT <kristjan.schmidt@googlemail.com>\n" "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n" Binary files differ@@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gst-plugins-ugly 0.10.17.2\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2014-05-21 12:49+0200\n" +"POT-Creation-Date: 2014-06-22 17:39+0200\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" Binary files differ@@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: gst-plugins-ugly-0.10.13.2\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2014-05-21 12:49+0200\n" +"POT-Creation-Date: 2014-06-22 17:39+0200\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" Binary files differ@@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: gst-plugins-ugly 0.10.10.2\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2014-05-21 12:49+0200\n" +"POT-Creation-Date: 2014-06-22 17:39+0200\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" Binary files differ@@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: gst-plugins-ugly 0.10.17.2\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2014-05-21 12:49+0200\n" +"POT-Creation-Date: 2014-06-22 17:39+0200\n" "PO-Revision-Date: 2011-04-28 09:25+0200\n" "Last-Translator: Claude Paroz <claude@2xlibre.net>\n" "Language-Team: French <traduc@traduc.org>\n" Binary files differ@@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: gst-plugins-ugly 1.0.3\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2014-05-21 12:49+0200\n" +"POT-Creation-Date: 2014-06-22 17:39+0200\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" diff --git a/po/gst-plugins-ugly-1.0.pot b/po/gst-plugins-ugly-1.0.pot index 2152165..b59741e 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.3.2\n" +"Project-Id-Version: gst-plugins-ugly 1.3.3\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2014-05-21 12:49+0200\n" +"POT-Creation-Date: 2014-06-22 17:39+0200\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" @@ -76,10 +76,10 @@ msgstr "" msgid "Failed to configure TwoLAME encoder. Check your encoding parameters." msgstr "" -#: gst/asfdemux/gstasfdemux.c:412 +#: gst/asfdemux/gstasfdemux.c:413 msgid "This stream contains no data." msgstr "" -#: gst/asfdemux/gstasfdemux.c:419 gst/asfdemux/gstasfdemux.c:1971 +#: gst/asfdemux/gstasfdemux.c:420 gst/asfdemux/gstasfdemux.c:1961 msgid "Internal data stream error." msgstr "" Binary files differ@@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: gst-plugins-ugly 0.10.17.2\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2014-05-21 12:49+0200\n" +"POT-Creation-Date: 2014-06-22 17:39+0200\n" "PO-Revision-Date: 2012-04-16 03:00+0200\n" "Last-Translator: Tomislav Krznar <tomislav.krznar@gmail.com>\n" "Language-Team: Croatian <lokalizacija@linux.hr>\n" Binary files differ@@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gst-plugins-ugly 1.0.3\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2014-05-21 12:49+0200\n" +"POT-Creation-Date: 2014-06-22 17:39+0200\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" Binary files differ@@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: gst-plugins-ugly 1.2.1\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2014-05-21 12:49+0200\n" +"POT-Creation-Date: 2014-06-22 17:39+0200\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" Binary files differ@@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: gst-plugins-ugly 0.10.11.2\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2014-05-21 12:49+0200\n" +"POT-Creation-Date: 2014-06-22 17:39+0200\n" "PO-Revision-Date: 2009-06-14 12:31+0200\n" "Last-Translator: Luca Ferretti <elle.uca@infinito.it>\n" "Language-Team: Italian <tp@lists.linux.it>\n" Binary files differ@@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: gst-plugins-ugly 1.0.3\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2014-05-21 12:49+0200\n" +"POT-Creation-Date: 2014-06-22 17:39+0200\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" Binary files differ@@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: gst-plugins-ugly-0.10.7.2\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2014-05-21 12:49+0200\n" +"POT-Creation-Date: 2014-06-22 17:39+0200\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" Binary files differ@@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gst-plugins-ugly 1.2.1\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2014-05-21 12:49+0200\n" +"POT-Creation-Date: 2014-06-22 17:39+0200\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" Binary files differ@@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: gst-plugins-ugly-0.10.11.2\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2014-05-21 12:49+0200\n" +"POT-Creation-Date: 2014-06-22 17:39+0200\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" Binary files differ@@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: gst-plugins-ugly-0.10.9.3\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2014-05-21 12:49+0200\n" +"POT-Creation-Date: 2014-06-22 17:39+0200\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" Binary files differ@@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: gst-plugins-ugly 1.0.3\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2014-05-21 12:49+0200\n" +"POT-Creation-Date: 2014-06-22 17:39+0200\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" Binary files differ@@ -1,14 +1,14 @@ -# translation of gst-plugins-ugly-1.0.3.nl.po to Dutch +# translation of gst-plugins-ugly-1.3.2.nl.po to Dutch # Copyright (C) 2004, 2007, 2008, 2009 Free Software Foundation, Inc. # # This file is distributed under the same license as the gst-plugins-ugly package. -# Freek de Kruijf <f.de.kruijf@gmail.com>, 2007, 2008, 2009, 2011, 2012. +# Freek de Kruijf <f.de.kruijf@gmail.com>, 2007, 2008, 2009, 2011, 2012, 2014. msgid "" msgstr "" -"Project-Id-Version: gst-plugins-ugly 1.0.3\n" +"Project-Id-Version: gst-plugins-ugly 1.3.2\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2014-05-21 12:49+0200\n" -"PO-Revision-Date: 2012-11-29 22:31+0100\n" +"POT-Creation-Date: 2014-06-22 17:39+0200\n" +"PO-Revision-Date: 2014-05-22 13:05+0200\n" "Last-Translator: Freek de Kruijf <f.de.kruijf@gmail.com>\n" "Language-Team: Dutch <vertaling@vrijschrift.org>\n" "Language: nl\n" Binary files differ@@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: gst-plugins-0.8.3\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2014-05-21 12:49+0200\n" +"POT-Creation-Date: 2014-06-22 17:39+0200\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" Binary files differ@@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: gst-plugins-ugly 1.0.3\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2014-05-21 12:49+0200\n" +"POT-Creation-Date: 2014-06-22 17:39+0200\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" diff --git a/po/pt_BR.gmo b/po/pt_BR.gmo Binary files differindex d84810b..1378d86 100644 --- a/po/pt_BR.gmo +++ b/po/pt_BR.gmo diff --git a/po/pt_BR.po b/po/pt_BR.po index 95080ad..4456ef6 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: gst-plugins-ugly-1.0.3\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2014-05-21 12:49+0200\n" +"POT-Creation-Date: 2014-06-22 17:39+0200\n" "PO-Revision-Date: 2013-08-20 22:54-0300\n" "Last-Translator: Fabrício Godoy <skarllot@gmail.com>\n" "Language-Team: Brazilian Portuguese <ldpbr-translation@lists.sourceforge." Binary files differ@@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: gst-plugins-ugly 0.10.14.2\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2014-05-21 12:49+0200\n" +"POT-Creation-Date: 2014-06-22 17:39+0200\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" Binary files differ@@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: gst-plugins-ugly 1.0.3\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2014-05-21 12:49+0200\n" +"POT-Creation-Date: 2014-06-22 17:39+0200\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" Binary files differ@@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gst-plugins-ugly 1.2.1\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2014-05-21 12:49+0200\n" +"POT-Creation-Date: 2014-06-22 17:39+0200\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" Binary files differ@@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: gst-plugins-ugly 0.10.17.2\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2014-05-21 12:49+0200\n" +"POT-Creation-Date: 2014-06-22 17:39+0200\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" Binary files differ@@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: gst-plugins 0.8.3\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2014-05-21 12:49+0200\n" +"POT-Creation-Date: 2014-06-22 17:39+0200\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" Binary files differ@@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: gst-plugins-ugly-1.1.4\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2014-05-21 12:49+0200\n" +"POT-Creation-Date: 2014-06-22 17:39+0200\n" "PO-Revision-Date: 2013-10-03 22:30+0200\n" "Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n" "Language-Team: Serbian <(nothing)>\n" Binary files differ@@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gst-plugins-ugly 0.10.10.2\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2014-05-21 12:49+0200\n" +"POT-Creation-Date: 2014-06-22 17:39+0200\n" "PO-Revision-Date: 2009-03-10 16:12+0100\n" "Last-Translator: Daniel Nylander <po@danielnylander.se>\n" "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n" Binary files differ@@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: gst-plugins-ugly-1.0.3\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2014-05-21 12:49+0200\n" +"POT-Creation-Date: 2014-06-22 17:39+0200\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" Binary files differ@@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: gst-plugins-ugly 1.0.3\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2014-05-21 12:49+0200\n" +"POT-Creation-Date: 2014-06-22 17:39+0200\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" Binary files differ@@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: gst-plugins-ugly-1.0.3\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2014-05-21 12:49+0200\n" +"POT-Creation-Date: 2014-06-22 17:39+0200\n" "PO-Revision-Date: 2012-12-02 08:07+0700\n" "Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n" "Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n" diff --git a/po/zh_CN.gmo b/po/zh_CN.gmo Binary files differindex 3429acd..0afa7e8 100644 --- a/po/zh_CN.gmo +++ b/po/zh_CN.gmo diff --git a/po/zh_CN.po b/po/zh_CN.po index ad7436f..397771a 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: gst-plugins-ugly 0.10.17.2\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2014-05-21 12:49+0200\n" +"POT-Creation-Date: 2014-06-22 17:39+0200\n" "PO-Revision-Date: 2011-12-20 10:58+0800\n" "Last-Translator: Wylmer Wang <wantinghard@gmail.com>\n" "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n" diff --git a/win32/common/config.h b/win32/common/config.h index f5ba984..bc7102f 100644 --- a/win32/common/config.h +++ b/win32/common/config.h @@ -61,7 +61,7 @@ #define GST_PACKAGE_ORIGIN "Unknown package origin" /* GStreamer package release date/time for plugins as YYYY-MM-DD */ -#define GST_PACKAGE_RELEASE_DATETIME "2014-05-21" +#define GST_PACKAGE_RELEASE_DATETIME "2014-06-22" /* Define if static plugins should be built */ #undef GST_PLUGIN_BUILD_STATIC @@ -248,7 +248,7 @@ #define PACKAGE_NAME "GStreamer Ugly Plug-ins" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "GStreamer Ugly Plug-ins 1.3.2" +#define PACKAGE_STRING "GStreamer Ugly Plug-ins 1.3.3" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "gst-plugins-ugly" @@ -257,7 +257,7 @@ #undef PACKAGE_URL /* Define to the version of this package. */ -#define PACKAGE_VERSION "1.3.2" +#define PACKAGE_VERSION "1.3.3" /* directory where plugins are located */ #ifdef _DEBUG @@ -288,7 +288,7 @@ #undef TARGET_CPU /* Version number of package */ -#define VERSION "1.3.2" +#define VERSION "1.3.3" /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most significant byte first (like Motorola and SPARC, unlike Intel). */ |