From e422308b72a9a699302fc2d582d52a705c3c4b10 Mon Sep 17 00:00:00 2001 From: Stefan Schweizer Date: Sat, 14 Apr 2007 13:04:56 +0000 Subject: [PATCH] oops, forgot the patch, thanks zzam Package-Manager: portage-2.1.2.3 --- media-libs/xine-lib/Manifest | 4 +++ .../xine-lib/files/xine-lib-cdda-fix.patch | 34 +++++++++++++++++++ 2 files changed, 38 insertions(+) create mode 100644 media-libs/xine-lib/files/xine-lib-cdda-fix.patch diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest index 7cfd4c2ff745..81ab698c45f1 100644 --- a/media-libs/xine-lib/Manifest +++ b/media-libs/xine-lib/Manifest @@ -2,6 +2,10 @@ AUX xine-lib-1.1.4-CVE-2007-1246.patch 1304 RMD160 56394c48df401162c225f956a9b83 MD5 30a23851923288df6d34e7791b2dfc2f files/xine-lib-1.1.4-CVE-2007-1246.patch 1304 RMD160 56394c48df401162c225f956a9b83fc8c3970668 files/xine-lib-1.1.4-CVE-2007-1246.patch 1304 SHA256 6771d7b21d68882501f20d338f794d8400ec683dec5e90b7bce54bafd7b9dceb files/xine-lib-1.1.4-CVE-2007-1246.patch 1304 +AUX xine-lib-cdda-fix.patch 1303 RMD160 4eb13d6112d60c5cda6244ae6c1e696a86654ffb SHA1 1cab891c9c533468ac0b6ffbb193f5a07c51a0af SHA256 85ec3f62d43745005f54ae3c2dfb4b2af72d2d02b656aad6bc3237479115c886 +MD5 447c61bea8e82ab50977620fa122d99d files/xine-lib-cdda-fix.patch 1303 +RMD160 4eb13d6112d60c5cda6244ae6c1e696a86654ffb files/xine-lib-cdda-fix.patch 1303 +SHA256 85ec3f62d43745005f54ae3c2dfb4b2af72d2d02b656aad6bc3237479115c886 files/xine-lib-cdda-fix.patch 1303 DIST xine-lib-1.1.2.tar.bz2 6457108 RMD160 21322d6d7e085237926741495d70f5ce7764910b SHA1 07e454e2287e34414b598faf78ae6d8ab8ffbb69 SHA256 871933c745f5824808a88720518c0164166906536c7f8723bd38e84f78319226 DIST xine-lib-1.1.3.tar.gz 8508884 RMD160 8e28638385ea48e7d4d4d702573ca92c4eca77c8 SHA1 c0886910ddb1afa1a72572decf12c0251bba40bf SHA256 96e50c6e7b2fb1209c52dcab6b38f2a99aa1c9d6e028b479a800cafef11bccb0 DIST xine-lib-1.1.4-xcb.patch.bz2 22346 RMD160 0e993341e7ca4bd1ae3604235a1004f1c5d6ee07 SHA1 51fb50edec0b3d66ef4b18667d332a885c5a8983 SHA256 8dc146699eadd52fcf1b1df296505fb24e5382696c40d325de22c782f7ca21bb diff --git a/media-libs/xine-lib/files/xine-lib-cdda-fix.patch b/media-libs/xine-lib/files/xine-lib-cdda-fix.patch new file mode 100644 index 000000000000..a289da04e39d --- /dev/null +++ b/media-libs/xine-lib/files/xine-lib-cdda-fix.patch @@ -0,0 +1,34 @@ + +# HG changeset patch +# User Diego 'Flameeyes' Pettenò +# Date 1176501310 -7200 +# Node ID 16e2e0741d34d2b8b47a835076aa1c15637d4964 +# Parent 7d3dcb71e309c19196e2027ba418fdb17f1d6c8d +Use the stream's audio_fifo as it hasn't been reported on the demuxer's instance yet. + +--- a/src/demuxers/demux_ac3.c Thu Apr 12 18:02:38 2007 +0200 ++++ b/src/demuxers/demux_ac3.c Fri Apr 13 23:55:10 2007 +0200 +@@ -138,7 +138,7 @@ static int open_ac3_file(demux_ac3_t *th + if (blocksize) { + this->input->seek(this->input, 0, SEEK_SET); + buf_element_t *buf = this->input->read_block(this->input, +- this->audio_fifo, ++ this->stream->audio_fifo, + blocksize); + this->input->seek(this->input, 0, SEEK_SET); + +--- a/src/demuxers/demux_dts.c Thu Apr 12 18:02:38 2007 +0200 ++++ b/src/demuxers/demux_dts.c Fri Apr 13 23:55:10 2007 +0200 +@@ -86,9 +86,9 @@ static int open_dts_file(demux_dts_t *th + + blocksize = this->input->get_blocksize(this->input); + if (blocksize) { +- this->input->seek(this->input, 0, SEEK_SET); ++ // this->input->seek(this->input, 0, SEEK_SET); + buf_element_t *buf = this->input->read_block(this->input, +- this->audio_fifo, ++ this->stream->audio_fifo, + blocksize); + this->input->seek(this->input, 0, SEEK_SET); + + -- 2.26.2