[Pkg-gstreamer-commits] [gst-fluendo-mp3] 01/05: Imported Upstream version 0.10.29.debian
Iain Lane
laney at moszumanska.debian.org
Wed Jun 25 16:59:42 UTC 2014
This is an automated email from the git hooks/post-receive script.
laney pushed a commit to branch master
in repository gst-fluendo-mp3.
commit 4d7dfb4ed0d221c8764926eed3fc7a0388ee1e08
Author: Iain Lane <laney at debian.org>
Date: Wed Jun 25 17:44:54 2014 +0100
Imported Upstream version 0.10.29.debian
---
ChangeLog | 11 +++++++++++
common/ChangeLog | 5 +++++
common/gst-compat.h | 1 +
configure | 28 ++++++++++++++--------------
configure.ac | 2 +-
configure.ac => configure.ac.orig | 7 ++++---
gst-fluendo-mp3.spec | 2 +-
src/bitstream.c | 5 ++++-
src/mp3tl-priv.h | 3 +++
win32/include/config-orig.h | 6 +++---
win32/oa/config.h | 6 +++---
win32/vs9/config.h | 6 +++---
12 files changed, 53 insertions(+), 29 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 4d18251..2d7023e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2014-06-25 Josep Torra <josep at fluendo.com>
+
+ * src/bitstream.c: (h_rewindNbits):
+ Avoid a segfault on some corrupted clips.
+
+2014-06-17 Release Maker <nomail at fluendo.com>
+
+ * configure.ac: Back to TRUNK.
+
+=== release 0.10.28 ===
+
2014-05-20 Josep Torra <josep at fluendo.com>
* src/flump3dec-0_10.c: (_update_ts), (gst_flump3dec_decode),
diff --git a/common/ChangeLog b/common/ChangeLog
index 80ad969..5c7ef90 100644
--- a/common/ChangeLog
+++ b/common/ChangeLog
@@ -1,3 +1,8 @@
+2014-06-19 Josep Torra <josep at fluendo.com>
+
+ * gst-compat.h:
+ Provide replacement for gst_adapter_unmap in GStreamer 0.10.
+
2014-05-14 Andoni Morales <amorales at fluendo.com>
* m4/staticplugins.m4:
diff --git a/common/gst-compat.h b/common/gst-compat.h
index 0c4b752..5520266 100644
--- a/common/gst-compat.h
+++ b/common/gst-compat.h
@@ -224,6 +224,7 @@ gst_buffer_new_wrapped (gpointer data, gsize size)
}
#define gst_adapter_map gst_adapter_peek
+#define gst_adapter_unmap(adapter) while(0)
#define gst_segment_do_seek gst_segment_set_seek
#define gst_tag_list_new_empty gst_tag_list_new
diff --git a/configure b/configure
index 4ed3c92..c163665 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 Fluendo MP3 Decoder 0.10.28.
+# Generated by GNU Autoconf 2.69 for GStreamer Fluendo MP3 Decoder 0.10.29.
#
#
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -587,8 +587,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='GStreamer Fluendo MP3 Decoder'
PACKAGE_TARNAME='gst-fluendo-mp3'
-PACKAGE_VERSION='0.10.28'
-PACKAGE_STRING='GStreamer Fluendo MP3 Decoder 0.10.28'
+PACKAGE_VERSION='0.10.29'
+PACKAGE_STRING='GStreamer Fluendo MP3 Decoder 0.10.29'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1490,7 +1490,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 Fluendo MP3 Decoder 0.10.28 to adapt to many kinds of systems.
+\`configure' configures GStreamer Fluendo MP3 Decoder 0.10.29 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1560,7 +1560,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of GStreamer Fluendo MP3 Decoder 0.10.28:";;
+ short | recursive ) echo "Configuration of GStreamer Fluendo MP3 Decoder 0.10.29:";;
esac
cat <<\_ACEOF
@@ -1765,7 +1765,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-GStreamer Fluendo MP3 Decoder configure 0.10.28
+GStreamer Fluendo MP3 Decoder configure 0.10.29
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2230,7 +2230,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 Fluendo MP3 Decoder $as_me 0.10.28, which was
+It was created by GStreamer Fluendo MP3 Decoder $as_me 0.10.29, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -3098,7 +3098,7 @@ fi
# Define the identity of the package.
PACKAGE='gst-fluendo-mp3'
- VERSION='0.10.28'
+ VERSION='0.10.29'
cat >>confdefs.h <<_ACEOF
@@ -3192,9 +3192,9 @@ END
fi
- PACKAGE_VERSION_MAJOR=$(echo 0.10.28 | cut -d'.' -f1)
- PACKAGE_VERSION_MINOR=$(echo 0.10.28 | cut -d'.' -f2)
- PACKAGE_VERSION_MICRO=$(echo 0.10.28 | cut -d'.' -f3)
+ PACKAGE_VERSION_MAJOR=$(echo 0.10.29 | cut -d'.' -f1)
+ PACKAGE_VERSION_MINOR=$(echo 0.10.29 | cut -d'.' -f2)
+ PACKAGE_VERSION_MICRO=$(echo 0.10.29 | cut -d'.' -f3)
@@ -3205,7 +3205,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking nano version" >&5
$as_echo_n "checking nano version... " >&6; }
- NANO=$(echo 0.10.28 | cut -d'.' -f4)
+ NANO=$(echo 0.10.29 | cut -d'.' -f4)
if test x"$NANO" = x || test "x$NANO" = "x0" ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: 0 (release)" >&5
@@ -18243,7 +18243,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 Fluendo MP3 Decoder $as_me 0.10.28, which was
+This file was extended by GStreamer Fluendo MP3 Decoder $as_me 0.10.29, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -18309,7 +18309,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 Fluendo MP3 Decoder config.status 0.10.28
+GStreamer Fluendo MP3 Decoder config.status 0.10.29
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index 52e825e..01a184a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7,7 +7,7 @@ dnl fill in your package name and version here
dnl the fourth (nano) number should be 0 for a release, 1 for CVS,
dnl and 2... for a prerelease
dnl releases only do -Wall, cvs and prerelease does -Werror too
-AC_INIT(GStreamer Fluendo MP3 Decoder, 0.10.28,,
+AC_INIT(GStreamer Fluendo MP3 Decoder, 0.10.29,,
gst-fluendo-mp3)
AC_CONFIG_MACRO_DIR([common/m4])
diff --git a/configure.ac b/configure.ac.orig
similarity index 95%
copy from configure.ac
copy to configure.ac.orig
index 52e825e..8cf6758 100644
--- a/configure.ac
+++ b/configure.ac.orig
@@ -7,11 +7,9 @@ dnl fill in your package name and version here
dnl the fourth (nano) number should be 0 for a release, 1 for CVS,
dnl and 2... for a prerelease
dnl releases only do -Wall, cvs and prerelease does -Werror too
-AC_INIT(GStreamer Fluendo MP3 Decoder, 0.10.28,,
+AC_INIT(GStreamer Fluendo MP3 Decoder, 0.10.29,,
gst-fluendo-mp3)
-AC_CONFIG_MACRO_DIR([common/m4])
-
AG_GST_INIT
dnl initialize automake
@@ -83,6 +81,9 @@ if test "x$HAVE_PKGCONFIG" = "xno"; then
AC_MSG_ERROR(you need to have pkgconfig installed !)
fi
+dnl Setup for finding IPP libraries. Attempt to detect by default.
+AG_NEED_IPP("ippac ipps")
+
dnl Now we're ready to ask for gstreamer libs and cflags
dnl And we can also ask for the right version of gstreamer
diff --git a/gst-fluendo-mp3.spec b/gst-fluendo-mp3.spec
index e0169a1..984b6b2 100644
--- a/gst-fluendo-mp3.spec
+++ b/gst-fluendo-mp3.spec
@@ -11,7 +11,7 @@
%{expand:%%define meego %(test -e /etc/meego-release && echo 1 || echo 0)}
Name: %{gstreamer}-fluendo-mp3
-Version: 0.10.28
+Version: 0.10.29
Release: 1.flu
Summary: Fluendo GStreamer plug-in for mp3 support
diff --git a/src/bitstream.c b/src/bitstream.c
index 71a3d75..dc8109b 100644
--- a/src/bitstream.c
+++ b/src/bitstream.c
@@ -257,7 +257,10 @@ h_rewindNbits (huffdec_bitbuf * bb, guint N)
bb->buf_bit_idx = 0;
bits = 8 - (N % 8);
bytes = (N + 8 + BS_ACUM_SIZE) >> 3;
- bb->buf_byte_idx -= bytes;
+ if (bb->buf_byte_idx >= bytes)
+ bb->buf_byte_idx -= bytes;
+ else
+ bb->buf_byte_idx = 0;
bb->remaining += bytes;
h_getbits (bb, bits);
}
diff --git a/src/mp3tl-priv.h b/src/mp3tl-priv.h
index acacd83..cf07d3a 100644
--- a/src/mp3tl-priv.h
+++ b/src/mp3tl-priv.h
@@ -8,6 +8,9 @@
#include <gst/gst.h>
#include "mp3tl.h"
+#ifdef USE_IPP
+#include "mp3-ipp.h"
+#endif
#include "mp3-c.h"
typedef short PCM[2][SSLIMIT][SBLIMIT];
diff --git a/win32/include/config-orig.h b/win32/include/config-orig.h
index 019f24e..0de05cb 100644
--- a/win32/include/config-orig.h
+++ b/win32/include/config-orig.h
@@ -123,13 +123,13 @@
#define PACKAGE_NAME "GStreamer Fluendo MP3 Decoder"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "GStreamer Fluendo MP3 Decoder 0.10.28"
+#define PACKAGE_STRING "GStreamer Fluendo MP3 Decoder 0.10.29"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "gst-fluendo-mp3"
/* Define to the version of this package. */
-#define PACKAGE_VERSION "0.10.28"
+#define PACKAGE_VERSION "0.10.29"
/* directory where plugins are located */
#define PLUGINDIR "/usr/local/lib/gstreamer-0.10"
@@ -162,7 +162,7 @@
#define USE_SINGLE_IPP_ARCH 0
/* Version number of package */
-#define VERSION "0.10.28"
+#define VERSION "0.10.29"
/* Define to 1 if your processor stores words with the most significant byte
first (like Motorola and SPARC, unlike Intel and VAX). */
diff --git a/win32/oa/config.h b/win32/oa/config.h
index 019f24e..0de05cb 100644
--- a/win32/oa/config.h
+++ b/win32/oa/config.h
@@ -123,13 +123,13 @@
#define PACKAGE_NAME "GStreamer Fluendo MP3 Decoder"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "GStreamer Fluendo MP3 Decoder 0.10.28"
+#define PACKAGE_STRING "GStreamer Fluendo MP3 Decoder 0.10.29"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "gst-fluendo-mp3"
/* Define to the version of this package. */
-#define PACKAGE_VERSION "0.10.28"
+#define PACKAGE_VERSION "0.10.29"
/* directory where plugins are located */
#define PLUGINDIR "/usr/local/lib/gstreamer-0.10"
@@ -162,7 +162,7 @@
#define USE_SINGLE_IPP_ARCH 0
/* Version number of package */
-#define VERSION "0.10.28"
+#define VERSION "0.10.29"
/* Define to 1 if your processor stores words with the most significant byte
first (like Motorola and SPARC, unlike Intel and VAX). */
diff --git a/win32/vs9/config.h b/win32/vs9/config.h
index 019f24e..0de05cb 100644
--- a/win32/vs9/config.h
+++ b/win32/vs9/config.h
@@ -123,13 +123,13 @@
#define PACKAGE_NAME "GStreamer Fluendo MP3 Decoder"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "GStreamer Fluendo MP3 Decoder 0.10.28"
+#define PACKAGE_STRING "GStreamer Fluendo MP3 Decoder 0.10.29"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "gst-fluendo-mp3"
/* Define to the version of this package. */
-#define PACKAGE_VERSION "0.10.28"
+#define PACKAGE_VERSION "0.10.29"
/* directory where plugins are located */
#define PLUGINDIR "/usr/local/lib/gstreamer-0.10"
@@ -162,7 +162,7 @@
#define USE_SINGLE_IPP_ARCH 0
/* Version number of package */
-#define VERSION "0.10.28"
+#define VERSION "0.10.29"
/* Define to 1 if your processor stores words with the most significant byte
first (like Motorola and SPARC, unlike Intel and VAX). */
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gstreamer/gst-fluendo-mp3.git
More information about the Pkg-gstreamer-commits
mailing list