diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2008-04-07 19:42:40 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2008-04-07 19:42:40 +0000 |
| commit | e9438ba67b119508ed80269cf31c0ac06b38a5d5 (patch) | |
| tree | fa0ad9537499d1df649feebb1526d565c7722be6 /media-libs/xine-lib/files | |
| parent | Version bump. (diff) | |
| download | gentoo-2-e9438ba67b119508ed80269cf31c0ac06b38a5d5.tar.gz gentoo-2-e9438ba67b119508ed80269cf31c0ac06b38a5d5.tar.bz2 gentoo-2-e9438ba67b119508ed80269cf31c0ac06b38a5d5.zip | |
version bump
(Portage version: 2.1.5_rc2)
Diffstat (limited to 'media-libs/xine-lib/files')
| -rw-r--r-- | media-libs/xine-lib/files/xine-lib-1.1.11.1-mkv.patch | 20 | ||||
| -rw-r--r-- | media-libs/xine-lib/files/xine-lib-1.1.11.1-qtniso.patch | 23 |
2 files changed, 43 insertions, 0 deletions
diff --git a/media-libs/xine-lib/files/xine-lib-1.1.11.1-mkv.patch b/media-libs/xine-lib/files/xine-lib-1.1.11.1-mkv.patch new file mode 100644 index 000000000000..18a4fdbf35a8 --- /dev/null +++ b/media-libs/xine-lib/files/xine-lib-1.1.11.1-mkv.patch @@ -0,0 +1,20 @@ +# 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 '&'... + +diff -r 05ebc886fd30 -r ff20b8db74ea src/demuxers/ebml.c +--- 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 @@ + if (text) + { + text[elem->len] = '\0'; +- if (ebml_read_ascii (ebml, &elem, text)) ++ if (ebml_read_ascii (ebml, elem, text)) + return text; + free (text); + } diff --git a/media-libs/xine-lib/files/xine-lib-1.1.11.1-qtniso.patch b/media-libs/xine-lib/files/xine-lib-1.1.11.1-qtniso.patch new file mode 100644 index 000000000000..54a9c6774541 --- /dev/null +++ b/media-libs/xine-lib/files/xine-lib-1.1.11.1-qtniso.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]); + |