Группа :: Система/Библиотеки
Пакет: gst-plugins0.10-base
навигация по пакетам
Главная Изменения Спек Патчи Sources Загрузить Gear Bugs and FR Repocop
Патч: gst-plugins0.10-base-0.10.36-alt4.patch
Скачать
Скачать
.gear/rules | 4 +
.../tags/b8218673c9ab9d322814371c840934af5b8f5f63 | 6 +
.gear/tags/list | 1 +
configure.ac | 3 +-
ext/gnomevfs/gstgnomevfsuri.c | 1 +
gst-libs/gst/audio/gstaudiodecoder.c | 12 +-
gst-libs/gst/audio/gstbaseaudiosink.c | 6 +
gst-libs/gst/pbutils/missing-plugins.c | 3 +
gst-libs/gst/riff/riff-media.c | 70 +++--
gst-libs/gst/rtsp/gstrtspconnection.c | 2 +-
gst-plugins-base-make43.patch | 37 +++
gst-plugins-base.spec | 294 +++++++++++++++++++++
gst/audioresample/resample.c | 4 +-
gst/typefind/gsttypefindfunctions.c | 2 +
14 files changed, 400 insertions(+), 45 deletions(-)
diff --git a/.gear/rules b/.gear/rules
new file mode 100644
index 000000000..6d1b40912
--- /dev/null
+++ b/.gear/rules
@@ -0,0 +1,4 @@
+copy: *.patch
+tar: RELEASE-@version@:.
+tar: cb5da59f450f0cea9a360bd95e6295cb53f28e09:. name=common
+diff: RELEASE-@version@:. .
diff --git a/.gear/tags/b8218673c9ab9d322814371c840934af5b8f5f63 b/.gear/tags/b8218673c9ab9d322814371c840934af5b8f5f63
new file mode 100644
index 000000000..f27cf084f
--- /dev/null
+++ b/.gear/tags/b8218673c9ab9d322814371c840934af5b8f5f63
@@ -0,0 +1,6 @@
+object 9faeeb8e45801e6b01d938a6001fff16f03d59b2
+type commit
+tag RELEASE-0.10.36
+tagger Tim-Philipp Mц╪ller <tim.muller@collabora.co.uk> 1329791038 +0000
+
+Release 0.10.36
diff --git a/.gear/tags/list b/.gear/tags/list
new file mode 100644
index 000000000..a28801ebd
--- /dev/null
+++ b/.gear/tags/list
@@ -0,0 +1 @@
+b8218673c9ab9d322814371c840934af5b8f5f63 RELEASE-0.10.36
diff --git a/configure.ac b/configure.ac
index 1901bcfb2..4ae3de832 100644
--- a/configure.ac
+++ b/configure.ac
@@ -72,10 +72,11 @@ AC_SUBST(ACLOCAL_AMFLAGS, "-I m4 -I common/m4")
dnl set up gettext
dnl the version check needs to stay here because autopoint greps for it
-AM_GNU_GETTEXT_VERSION([0.17])
AM_GNU_GETTEXT([external])
AG_GST_GETTEXT([gst-plugins-base-$GST_MAJORMINOR])
+IT_PROG_INTLTOOL
+
dnl *** check for arguments to configure ***
AG_GST_ARG_DEBUG
diff --git a/ext/gnomevfs/gstgnomevfsuri.c b/ext/gnomevfs/gstgnomevfsuri.c
index e811c31b6..da1bab427 100644
--- a/ext/gnomevfs/gstgnomevfsuri.c
+++ b/ext/gnomevfs/gstgnomevfsuri.c
@@ -48,6 +48,7 @@ _internal_get_supported_uris (gpointer data)
"sftp://localhost/bla",
"nfs://localhost/bla",
"ssh://localhost/bla",
+ "dav://localhost/bla",
"burn://"
};
GnomeVFSURI *uri;
diff --git a/gst-libs/gst/audio/gstaudiodecoder.c b/gst-libs/gst/audio/gstaudiodecoder.c
index e35779e14..00a30b4ec 100644
--- a/gst-libs/gst/audio/gstaudiodecoder.c
+++ b/gst-libs/gst/audio/gstaudiodecoder.c
@@ -220,6 +220,7 @@ struct _GstAudioDecoderPrivate
GstAdapter *adapter;
/* tracking input ts for changes */
GstClockTime prev_ts;
+ guint64 prev_distance;
/* frames obtained from input */
GQueue frames;
/* collected output data */
@@ -444,6 +445,7 @@ gst_audio_decoder_reset (GstAudioDecoder * dec, gboolean full)
dec->priv->out_ts = GST_CLOCK_TIME_NONE;
dec->priv->out_dur = 0;
dec->priv->prev_ts = GST_CLOCK_TIME_NONE;
+ dec->priv->prev_distance = 0;
dec->priv->drained = TRUE;
dec->priv->base_ts = GST_CLOCK_TIME_NONE;
dec->priv->samples = 0;
@@ -976,6 +978,7 @@ gst_audio_decoder_push_buffers (GstAudioDecoder * dec, gboolean force)
if (G_LIKELY (av)) {gint len;
GstClockTime ts;
+ guint64 distance;
/* parse if needed */
if (klass->parse) {@@ -1015,12 +1018,13 @@ gst_audio_decoder_push_buffers (GstAudioDecoder * dec, gboolean force)
len = av;
}
/* track upstream ts, but do not get stuck if nothing new upstream */
- ts = gst_adapter_prev_timestamp (priv->adapter, NULL);
- if (ts == priv->prev_ts) {+ ts = gst_adapter_prev_timestamp (priv->adapter, &distance);
+ if (ts != priv->prev_ts || distance <= priv->prev_distance) {+ priv->prev_ts = ts;
+ priv->prev_distance = distance;
+ } else {GST_LOG_OBJECT (dec, "ts == prev_ts; discarding");
ts = GST_CLOCK_TIME_NONE;
- } else {- priv->prev_ts = ts;
}
buffer = gst_adapter_take_buffer (priv->adapter, len);
buffer = gst_buffer_make_metadata_writable (buffer);
diff --git a/gst-libs/gst/audio/gstbaseaudiosink.c b/gst-libs/gst/audio/gstbaseaudiosink.c
index e7ff30d01..5066ca9bd 100644
--- a/gst-libs/gst/audio/gstbaseaudiosink.c
+++ b/gst-libs/gst/audio/gstbaseaudiosink.c
@@ -921,6 +921,12 @@ gst_base_audio_sink_setcaps (GstBaseSink * bsink, GstCaps * caps)
if (!gst_ring_buffer_acquire (sink->ringbuffer, spec))
goto acquire_error;
+ /* We need to resync since the ringbuffer restarted */
+ sink->priv->avg_skew = -1;
+ sink->next_sample = -1;
+ sink->priv->eos_time = -1;
+ sink->priv->discont_time = -1;
+
if (bsink->pad_mode == GST_ACTIVATE_PUSH) {GST_DEBUG_OBJECT (sink, "activate ringbuffer");
gst_ring_buffer_activate (sink->ringbuffer, TRUE);
diff --git a/gst-libs/gst/pbutils/missing-plugins.c b/gst-libs/gst/pbutils/missing-plugins.c
index 1b6d44bb2..6b343c5de 100644
--- a/gst-libs/gst/pbutils/missing-plugins.c
+++ b/gst-libs/gst/pbutils/missing-plugins.c
@@ -152,6 +152,9 @@ copy_and_clean_caps (const GstCaps * caps)
gst_structure_remove_field (s, "play-speed");
gst_structure_remove_field (s, "play-scale");
gst_structure_remove_field (s, "dynamic_range");
+ /* mpegaudioversion is a duplicate for mpegversion
+ * https://bugzilla.redhat.com/show_bug.cgi?id=680809 */
+ gst_structure_remove_field (s, "mpegaudioversion");
return ret;
}
diff --git a/gst-libs/gst/riff/riff-media.c b/gst-libs/gst/riff/riff-media.c
index 40b2bf628..4d61290e8 100644
--- a/gst-libs/gst/riff/riff-media.c
+++ b/gst-libs/gst/riff/riff-media.c
@@ -1130,44 +1130,38 @@ gst_riff_create_audio_caps (guint16 codec_id,
if (strf != NULL) {gint ba = strf->blockalign;
gint ch = strf->channels;
- gint wd, ws;
+ gint ws;
- /* If we have an empty blockalign, we take the width contained in
- * strf->size */
- if (ba != 0)
- wd = ba * 8 / ch;
- else
- wd = strf->size;
-
- if (strf->size > 32) {- GST_WARNING ("invalid depth (%d) of pcm audio, overwriting.",- strf->size);
- strf->size = 8 * ((wd + 7) / 8);
- }
-
- /* in riff, the depth is stored in the size field but it just means that
- * the _least_ significant bits are cleared. We can therefore just play
- * the sample as if it had a depth == width */
- /* For reference, the actual depth is in strf->size */
- ws = wd;
+ if (ba > 0 && ch > 0 && (ba == (64 / 8) * ch || ba == (32 / 8) * ch)) {+ gint wd = ba * 8 / ch;
- caps = gst_caps_new_simple ("audio/x-raw-int",- "endianness", G_TYPE_INT, G_LITTLE_ENDIAN,
- "channels", G_TYPE_INT, ch,
- "width", G_TYPE_INT, wd,
- "depth", G_TYPE_INT, ws, "signed", G_TYPE_BOOLEAN, wd != 8, NULL);
+ if (strf->size > 32) {+ GST_WARNING ("invalid depth (%d) of pcm audio, overwriting.",+ strf->size);
+ strf->size = 8 * ((wd + 7) / 8);
+ }
- /* Add default channel layout. In theory this should be done
- * for 1 and 2 channels too but apparently breaks too many
- * things currently. Also we know no default layout for more than
- * 8 channels. */
- if (ch > 2) {- if (ch > 8)
- GST_WARNING ("don't know default layout for %d channels", ch);- else if (gst_riff_wave_add_default_channel_layout (caps))
- GST_DEBUG ("using default channel layout for %d channels", ch);- else
- GST_WARNING ("failed to add channel layout");+ caps = gst_caps_new_simple ("audio/x-raw-int",+ "endianness", G_TYPE_INT, G_LITTLE_ENDIAN,
+ "channels", G_TYPE_INT, ch,
+ "width", G_TYPE_INT, wd,
+ "depth", G_TYPE_INT, ws, "signed", G_TYPE_BOOLEAN, wd != 8, NULL);
+
+ /* Add default channel layout. In theory this should be done
+ * for 1 and 2 channels too but apparently breaks too many
+ * things currently. Also we know no default layout for more than
+ * 8 channels. */
+ if (ch > 2) {+ if (ch > 8)
+ GST_WARNING ("don't know default layout for %d channels", ch);+ else if (gst_riff_wave_add_default_channel_layout (caps))
+ GST_DEBUG ("using default channel layout for %d channels", ch);+ else
+ GST_WARNING ("failed to add channel layout");+ }
+ } else {+ GST_WARNING ("invalid block align %d or channel count %d", ba, ch);+ return NULL;
}
} else {/* FIXME: this is pretty useless - we need fixed caps */
@@ -1495,7 +1489,8 @@ gst_riff_create_audio_caps (guint16 codec_id,
subformat_guid[2] == 0xaa000080 && subformat_guid[3] == 0x719b3800) { if (subformat_guid[0] == 0x00000001) { GST_DEBUG ("PCM");- if (strf != NULL) {+ if (strf != NULL && strf->blockalign != 0 && strf->channels != 0
+ && strf->rate != 0) {gint ba = strf->blockalign;
gint wd = ba * 8 / strf->channels;
gint ws;
@@ -1541,7 +1536,8 @@ gst_riff_create_audio_caps (guint16 codec_id,
}
} else if (subformat_guid[0] == 0x00000003) { GST_DEBUG ("FLOAT");- if (strf != NULL) {+ if (strf != NULL && strf->blockalign != 0 && strf->channels != 0
+ && strf->rate != 0) {gint ba = strf->blockalign;
gint wd = ba * 8 / strf->channels;
diff --git a/gst-libs/gst/rtsp/gstrtspconnection.c b/gst-libs/gst/rtsp/gstrtspconnection.c
index 731add3b7..9e6ddf86f 100644
--- a/gst-libs/gst/rtsp/gstrtspconnection.c
+++ b/gst-libs/gst/rtsp/gstrtspconnection.c
@@ -2007,7 +2007,7 @@ build_next (GstRTSPBuilder * builder, GstRTSPMessage * message,
maxlen = sizeof (conn->session_id) - 1;
/* the sessionid can have attributes marked with ;
* Make sure we strip them */
- for (i = 0; session_id[i] != '\0'; i++) {+ for (i = 0; i < maxlen && session_id[i] != '\0'; i++) { if (session_id[i] == ';') {maxlen = i;
/* parse timeout */
diff --git a/gst-plugins-base-make43.patch b/gst-plugins-base-make43.patch
new file mode 100644
index 000000000..661a3e7e9
--- /dev/null
+++ b/gst-plugins-base-make43.patch
@@ -0,0 +1,37 @@
+diff --git a/glib-gen.mak b/glib-gen.mak
+index ef93a5f79..69b48164c 100644
+--- a/glib-gen.mak
++++ b/glib-gen.mak
+@@ -1,11 +1,12 @@
+ # these are the variables your Makefile.am should set
+ # the example is based on the colorbalance interface
+
++H := \#
+ #glib_enum_headers=$(colorbalance_headers)
+ #glib_enum_define=GST_COLOR_BALANCE
+ #glib_enum_prefix=gst_color_balance
+
+-enum_headers=$(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
++enum_headers=$(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\")
+
+ # these are all the rules generating the relevant files
+ %-marshal.h: %-marshal.list
+diff --git a/gst-glib-gen.mak b/gst-glib-gen.mak
+index cc82bbd2a..07a09caba 100644
+--- a/gst-glib-gen.mak
++++ b/gst-glib-gen.mak
+@@ -1,12 +1,13 @@
+ # these are the variables your Makefile.am should set
+ # the example is based on the colorbalance interface
+
++H := \#
+ #glib_enum_headers=$(colorbalance_headers)
+ #glib_enum_define=GST_COLOR_BALANCE
+ #glib_gen_prefix=gst_color_balance
+ #glib_gen_basename=colorbalance
+
+-enum_headers=$(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
++enum_headers=$(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\")
+
+ # these are all the rules generating the relevant files
+ $(glib_gen_basename)-marshal.h: $(glib_gen_basename)-marshal.list
diff --git a/gst-plugins-base.spec b/gst-plugins-base.spec
new file mode 100644
index 000000000..ff83cb099
--- /dev/null
+++ b/gst-plugins-base.spec
@@ -0,0 +1,294 @@
+%define gst_plugins gst-plugins0.10
+%define ver_major 0.10
+
+%define _gst_libdir %_libdir/gstreamer-%ver_major
+%define _gtk_docdir %_datadir/gtk-doc/html
+
+Name: %gst_plugins-base
+Version: %ver_major.36
+Release: alt4
+Summary: An essential set of GStreamer plugins (legacy version)
+Group: System/Libraries
+License: LGPL-2.0
+URL: http://gstreamer.freedesktop.org/
+
+Requires: lib%gst_plugins = %version-%release
+Requires: gstreamer
+
+Provides: gstreamer(audio-hardware-sink) = %version
+Provides: gstreamer(audio-hardware-source) = %version
+
+Provides: %name-audio-filters = %version-%release
+Provides: %name-test = %version-%release
+Provides: %name-video-filters = %version-%release
+Provides: %name-network = %version-%release
+Provides: %name-subtitle = %version-%release
+Provides: %gst_plugins-all = %version-%release
+Provides: %gst_plugins-network = %version-%release
+Provides: %gst_plugins-subtitle = %version-%release
+Provides: %gst_plugins-test = %version-%release
+Provides: %gst_plugins-audio-filters = %version-%release
+Provides: %gst_plugins-audio-formats = %version-%release
+Provides: %gst_plugins-video-filters = %version-%release
+Provides: %gst_plugins-video-formats = %version-%release
+Provides: %gst_plugins-video-effects = %version-%release
+Provides: %gst_plugins-container-formats = %version-%release
+Provides: %gst_plugins-alsa = %version-%release
+Provides: %gst_plugins-cdparanoia = %version-%release
+Provides: %gst_plugins-ogg = %version-%release
+Provides: %gst_plugins-theora = %version-%release
+Provides: %gst_plugins-vorbis = %version-%release
+Provides: %gst_plugins-ximagesink = %version-%release
+Provides: %gst_plugins-xvideo = %version-%release
+Provides: %gst_plugins-libvisual = %version-%release
+Provides: %gst_plugins-visualization = %version-%release
+Provides: %gst_plugins-gnomevfs = %version-%release
+Provides: %gst_plugins-gio = %version-%release
+Provides: %gst_plugins-pango = %version-%release
+
+Obsoletes: %gst_plugins-all < %version
+Obsoletes: %gst_plugins-network < %version
+Obsoletes: %gst_plugins-subtitle < %version
+Obsoletes: %gst_plugins-test < %version
+Obsoletes: %gst_plugins-audio-formats < %version
+Obsoletes: %gst_plugins-audio-filters < %version
+Obsoletes: %gst_plugins-video-formats < %version
+Obsoletes: %gst_plugins-video-filters < %version
+Obsoletes: %gst_plugins-video-effects < %version
+Obsoletes: %gst_plugins-container-formats < %version
+Obsoletes: %gst_plugins-libvisual < %version
+Obsoletes: %gst_plugins-visualization < %version
+Obsoletes: %gst_plugins-gnomevfs < %version
+Obsoletes: %gst_plugins-gio < %version
+Obsoletes: %gst_plugins-pango < %version
+
+Source: %name-%version.tar
+Source1: common.tar
+Patch: %name-%version-%release.patch
+Patch1: gst-plugins-base-make43.patch
+
+BuildRequires: gstreamer0.10-devel gtk-doc intltool libSM-devel libXext-devel libXv-devel libalsa-devel libgtk+2-devel
+BuildRequires: libcdparanoia-devel liboil-devel libtheora-devel libvorbis-devel orc liborc-test-devel gstreamer0.10-gir-devel
+BuildRequires: gobject-introspection-devel
+
+%description
+GStreamer Base Plug-ins is a well-groomed and well-maintained
+collection of GStreamer plug-ins and elements, spanning the range of
+possible types of elements one would want to write for GStreamer. A
+wide range of video and audio decoders, encoders, and filters are
+included.
+
+%package -n lib%name
+Summary: GStreamer plugin libraries (legacy version)
+Group: System/Libraries
+Conflicts: %gst_plugins-bad <= 0.10.9
+
+%description -n lib%name
+Helper libraries for GStreamer plugins, containing base classes useful for elements
+
+%prep
+%setup -q -a1
+%patch -p1
+%patch1 -p1 -d common
+
+touch ABOUT-NLS config.rpath
+subst '/.PHONY/d' Makefile.am
+
+%build
+%autoreconf
+%configure \
+ --with-default-audiosrc=pulsesrc \
+ --with-default-audiosink=pulsesink \
+ --with-default-videosrc=v4l2src \
+ --with-default-videosink=xvimagesink \
+ --disable-examples \
+ --disable-valgrind \
+ --disable-gtk-doc \
+ --disable-experimental \
+ --enable-gio \
+ --disable-debug \
+ --disable-static \
+ --with-html-dir=%_gtk_docdir
+%make_build
+
+%install
+%make DESTDIR=%buildroot install
+
+%files -n lib%name
+%_libdir/*.so.*
+
+%changelog
+* Thu Sep 23 2021 Andrey Cherepanov <cas@altlinux.org> 0.10.36-alt4
+- FTBFS: remove python-module-PyXML.
+
+* Mon Apr 20 2020 Andrey Cherepanov <cas@altlinux.org> 0.10.36-alt3
+- Apply patches from Debian.
+- Fixes:
+ + CVE-2017-5837
+ + CVE-2017-5844
+ + CVE-2019-9928
+- Fix build with make 4.3.0 (patch obtained from https://bugs.gentoo.org/show_bug.cgi?id=706076).
+- Fix License tag according to SPDX.
+
+* Wed Jul 24 2019 Andrey Cherepanov <cas@altlinux.org> 0.10.36-alt2
+- Rename and package only libraries for legacy software.
+
+* Tue Feb 21 2012 Valery Inozemtsev <shrek@altlinux.ru> 0.10.36-alt1
+- 0.10.36
+
+* Fri Jun 17 2011 Valery Inozemtsev <shrek@altlinux.ru> 0.10.35-alt1
+- 0.10.35
+
+* Sun May 15 2011 Valery Inozemtsev <shrek@altlinux.ru> 0.10.33-alt1
+- 0.10.33
+
+* Wed Mar 09 2011 Valery Inozemtsev <shrek@altlinux.ru> 0.10.32-alt2
+- rebuilt for debuginfo
+
+* Sat Jan 22 2011 Valery Inozemtsev <shrek@altlinux.ru> 0.10.32-alt1
+- 0.10.32
+
+* Wed Dec 01 2010 Valery Inozemtsev <shrek@altlinux.ru> 0.10.31-alt3
+- rebuild with orc-0.4.11
+
+* Wed Dec 01 2010 Valery Inozemtsev <shrek@altlinux.ru> 0.10.31-alt2
+- added provides/obsoletes gst-plugins-test
+
+* Tue Nov 30 2010 Valery Inozemtsev <shrek@altlinux.ru> 0.10.31-alt1
+- 0.10.31
+
+* Fri Jul 23 2010 Valery Inozemtsev <shrek@altlinux.ru> 0.10.30-alt1
+- 0.10.30
+
+* Thu May 20 2010 Valery Inozemtsev <shrek@altlinux.ru> 0.10.29-alt2
+- added support for On2 VP8
+
+* Wed Apr 28 2010 Valery Inozemtsev <shrek@altlinux.ru> 0.10.29-alt1
+- 0.10.29
+
+* Thu Apr 01 2010 Valery Inozemtsev <shrek@altlinux.ru> 0.10.28-alt2
+- rebuild
+
+* Tue Mar 09 2010 Valery Inozemtsev <shrek@altlinux.ru> 0.10.28-alt1
+- 0.10.28
+
+* Sat Mar 06 2010 Valery Inozemtsev <shrek@altlinux.ru> 0.10.27-alt1
+- 0.10.27
+
+* Thu Feb 11 2010 Valery Inozemtsev <shrek@altlinux.ru> 0.10.26-alt1
+- 0.10.26
+
+* Tue Oct 13 2009 Valery Inozemtsev <shrek@altlinux.ru> 0.10.25-alt2
+- build with gobject-introspection
+
+* Mon Oct 05 2009 Valery Inozemtsev <shrek@altlinux.ru> 0.10.25-alt1
+- 0.10.25
+
+* Mon Aug 10 2009 Valery Inozemtsev <shrek@altlinux.ru> 0.10.24-alt2
+- build cdparanoia plugin
+
+* Wed Aug 05 2009 Valery Inozemtsev <shrek@altlinux.ru> 0.10.24-alt1
+- 0.10.24
+
+* Mon May 11 2009 Valery Inozemtsev <shrek@altlinux.ru> 0.10.23-alt1
+- 0.10.23
+
+* Wed Feb 25 2009 Valery Inozemtsev <shrek@altlinux.ru> 0.10.22-alt3
+- updated build dependencies
+
+* Fri Jan 23 2009 Valery Inozemtsev <shrek@altlinux.ru> 0.10.22-alt2
+- fixed conflicts with gst-plugins-bad (close #18608)
+
+* Tue Jan 20 2009 Valery Inozemtsev <shrek@altlinux.ru> 0.10.22-alt1
+- 0.10.22
+
+* Sat Nov 22 2008 Valery Inozemtsev <shrek@altlinux.ru> 0.10.21-alt3
+- removed obsolete %%post_ldconfig/%%postun_ldconfig calls
+
+* Wed Oct 08 2008 Valery Inozemtsev <shrek@altlinux.ru> 0.10.21-alt2
+- enabled GIO plugin
+
+* Fri Oct 03 2008 Valery Inozemtsev <shrek@altlinux.ru> 0.10.21-alt1
+- 0.10.21
+
+* Wed Jun 18 2008 Valery Inozemtsev <shrek@altlinux.ru> 0.10.20-alt1
+- 0.10.20
+
+* Thu May 15 2008 Valery Inozemtsev <shrek@altlinux.ru> 0.10.19-alt2
+- rebuild
+
+* Thu Apr 03 2008 Valery Inozemtsev <shrek@altlinux.ru> 0.10.19-alt1
+- 0.10.19
+
+* Sun Mar 23 2008 Valery Inozemtsev <shrek@altlinux.ru> 0.10.18-alt1
+- 0.10.18
+
+* Sat Feb 23 2008 Valery Inozemtsev <shrek@altlinux.ru> 0.10.17-alt4
+- real fix provides
+
+* Fri Feb 22 2008 Valery Inozemtsev <shrek@altlinux.ru> 0.10.17-alt3
+- fixed provides
+
+* Thu Feb 21 2008 Valery Inozemtsev <shrek@altlinux.ru> 0.10.17-alt2
+- join together subpackage
+
+* Thu Feb 07 2008 Valery Inozemtsev <shrek@altlinux.ru> 0.10.17-alt1
+- 0.10.17
+- spec cleanup
+- update build dependencies
+
+* Wed Jan 09 2008 Igor Zubkov <icesik@altlinux.org> 0.10.14-alt3
+- add workaround for broken XV support in video drivers.
+ if XV support broken in video driver,
+ export GST_VIDEOSINK_XLIB=1 and gstreamer will use ximagesink
+ instead xvimagesink
+
+* Wed Jan 09 2008 Igor Zubkov <icesik@altlinux.org> 0.10.14-alt2
+- fix playing small ogg files (alt#13267, gnome#466717)
+
+* Mon Sep 10 2007 Igor Zubkov <icesik@altlinux.org> 0.10.14-alt1
+- 0.10.12 -> 0.10.14
+
+* Tue Mar 13 2007 Igor Zubkov <icesik@altlinux.org> 0.10.12-alt1
+- 0.10.11 -> 0.10.12
+
+* Tue Feb 20 2007 Igor Zubkov <icesik@altlinux.org> 0.10.11-alt1
+- 0.10.9 -> 0.10.11
+
+* Wed Aug 23 2006 Mikhail Zabaluev <mhz@altlinux.ru> 0.10.9-alt1
+- Release 0.10.9
+
+* Tue Jun 13 2006 Mikhail Zabaluev <mhz@altlinux.ru> 0.10.8-alt1
+- Release 0.10.8
+
+* Sun May 28 2006 Mikhail Zabaluev <mhz@altlinux.ru> 0.10.7-alt1
+- Updated to 0.10.7
+- Renamed gst-plugins-x11 to gst-plugins-ximagesink
+
+* Fri Apr 14 2006 Mikhail Zabaluev <mhz@altlinux.ru> 0.10.5-alt1
+- Release 0.10.5
+
+* Sun Mar 12 2006 Mikhail Zabaluev <mhz@altlinux.ru> 0.10.4-alt1
+- Release 0.10.4
+
+* Sat Feb 11 2006 Mikhail Zabaluev <mhz@altlinux.ru> 0.10.3-alt1
+- 0.10.3
+- Renamed debug to test
+- Renamed effects to filters
+- Buildreq
+
+* Wed Jan 18 2006 Mikhail Zabaluev <mhz@altlinux.ru> 0.10.2-alt1
+- 0.10.2
+- Enabled cdparanoia back after the upstream
+- Added the cdparanoia plugin package in earnest
+
+* Wed Dec 28 2005 Mikhail Zabaluev <mhz@altlinux.ru> 0.10.1-alt1
+- 0.10.1
+- Disabled cdparanoia after the upstream
+
+* Sat Dec 10 2005 Mikhail Zabaluev <mhz@altlinux.ru> 0.10.0-alt1
+- Updated to 0.10.0
+- Added pango plugin
+
+* Fri Nov 25 2005 Mikhail Zabaluev <mhz@altlinux.ru> 0.9.6-alt1
+- Initial release for Sisyphus of plugins as split in 0.9
diff --git a/gst/audioresample/resample.c b/gst/audioresample/resample.c
index 490eebcc4..f6c248cc0 100644
--- a/gst/audioresample/resample.c
+++ b/gst/audioresample/resample.c
@@ -77,13 +77,13 @@
#define EXPORT G_GNUC_INTERNAL
#ifdef _USE_SSE
-#ifndef HAVE_XMMINTRIN_H
+#if !defined(__SSE__) || !defined(HAVE_XMMINTRIN_H)
#undef _USE_SSE
#endif
#endif
#ifdef _USE_SSE2
-#ifndef HAVE_EMMINTRIN_H
+#if !defined(__SSE2__) || !defined(HAVE_EMMINTRIN_H)
#undef _USE_SSE2
#endif
#endif
diff --git a/gst/typefind/gsttypefindfunctions.c b/gst/typefind/gsttypefindfunctions.c
index 27823b64b..c8629b76d 100644
--- a/gst/typefind/gsttypefindfunctions.c
+++ b/gst/typefind/gsttypefindfunctions.c
@@ -4149,6 +4149,8 @@ windows_icon_typefind (GstTypeFind * find, gpointer user_data)
gint32 size, offset;
datalen = gst_type_find_get_length (find);
+ if (datalen < 18)
+ return;
if ((data = gst_type_find_peek (find, 0, 6)) == NULL)
return;