* Wed Apr 9 2008 Ville Skyttä <ville.skytta at iki.fi>

- Apply upstream fixes for Quicktime (#441705) and Matroska regressions
  introduced in 1.1.11.1.

xine-lib-1.1.11.1-mkv.patch

@@ -0,0 +1,21 @@
+
+# HG changeset patch
+# User Darren Salt <linux@youmustbejoking.demon.co.uk>
+# Date 1207353205 -3600
+# Node ID ff20b8db74eabc74b7b95da4c1b44fc5d7f2ec8c
+# Parent 05ebc886fd30158b59a26e03cf2f6f3a52114b24
+Fix a regression in the Matroska demuxer.
+One '&'...
+
+--- a/src/demuxers/ebml.c	Fri Apr 04 18:35:33 2008 +0100
++++ b/src/demuxers/ebml.c	Sat Apr 05 00:53:25 2008 +0100
+@@ -327,7 +327,7 @@ char *ebml_alloc_read_ascii (ebml_parser
+   if (text)
+   {
+     text[elem->len] = '\0';
+-    if (ebml_read_ascii (ebml, &elem, text))
++    if (ebml_read_ascii (ebml, elem, text))
+       return text;
+     free (text);
+   }
+

xine-lib-1.1.11.1-qt.patch

@@ -0,0 +1,23 @@
+
+# HG changeset patch
+# User Darren Salt <linux@youmustbejoking.demon.co.uk>
+# Date 1206976103 -3600
+# Node ID d8e1305c13820b82d896f7bc77d196b9c9645dd6
+# Parent 2cc583bdc498fd6c95b8a21c10e81a0cef4d63c6
+Revert a change which broke Quicktime atom parsing.
+
+--- a/src/demuxers/demux_qt.c	Sun Mar 30 19:48:58 2008 +0100
++++ b/src/demuxers/demux_qt.c	Mon Mar 31 16:08:23 2008 +0100
+@@ -895,11 +895,6 @@ static qt_error parse_trak_atom (qt_trak
+   for (i = ATOM_PREAMBLE_SIZE; i < trak_atom_size - 4; i++) {
+     current_atom_size = _X_BE_32(&trak_atom[i - 4]);	
+     current_atom = _X_BE_32(&trak_atom[i]);
+-
+-    if (current_atom_size > trak_atom_size - i) {
+-      last_error = QT_NOT_A_VALID_FILE;
+-      goto free_trak;
+-    }
+ 
+     if (current_atom == TKHD_ATOM) {
+       trak->flags = _X_BE_16(&trak_atom[i + 6]);
+

xine-lib.spec

@@ -32,7 +32,7 @@
 Summary:        Xine library
 Name:           xine-lib
 Version:        1.1.11.1
-Release:        1%{?dist}
+Release:        1%{?dist}.1
 License:        GPLv2+
 Group:          System Environment/Libraries
 URL:            http://xinehq.de/
@@ -48,6 +48,10 @@ Patch1:         %{name}-1.1.4-optflags.patch
 Patch6:         %{name}-1.1.1-deepbind-939.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+# upstream patches
+Patch101:       %{name}-1.1.11.1-mkv.patch
+Patch102:       %{name}-1.1.11.1-qt.patch
+
 Provides:       xine-lib(plugin-abi) = %{abiver}
 # X11
 BuildRequires:  libX11-devel
@@ -169,6 +173,9 @@ touch -r m4/optimizations.m4.stamp m4/optimizations.m4
 # Patch6 needed at least when compiling with external ffmpeg, #939.
 %patch6 -p1 -b .deepbind
 
+%patch101 -p1 -b .mkv
+%patch102 -p1 -b .qt
+
 # Avoid standard rpaths on lib64 archs:
 sed -i -e 's|"/lib /usr/lib\b|"/%{_lib} %{_libdir}|' configure
 
@@ -386,6 +393,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Apr  9 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.1.11.1-1.1
+- Apply upstream fixes for Quicktime (#441705) and Matroska regressions
+  introduced in 1.1.11.1.
+
 * Sun Mar 30 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.1.11.1-1
 - 1.1.11.1 (security update, #438663, CVE-2008-1482).
 - Provide versioned xine-lib(plugin-abi) so 3rd party packages installing