diff options
| author |   Daniel Pielmeier <billie@gentoo.org> | 2014-03-24 17:33:45 +0000 |
|---|---|---|
| committer | Daniel Pielmeier <billie@gentoo.org> | 2014-03-24 17:33:45 +0000 |
| commit | c83bed3501612b7305856b6c363b966b1250b88a (patch) | |
| tree | 4ba96db84986e00b8fd76adc92f58259f4d023b4 /media-sound | |
| parent | Remove old. (diff) | |
| download | gentoo-2-c83bed3501612b7305856b6c363b966b1250b88a.tar.gz gentoo-2-c83bed3501612b7305856b6c363b966b1250b88a.tar.bz2 gentoo-2-c83bed3501612b7305856b6c363b966b1250b88a.zip | |
Fix bug #505330. Thanks to Bob Johnson for the report.
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 215AD14D)
Diffstat (limited to 'media-sound')
| -rw-r--r-- | media-sound/aqualung/ChangeLog | 7 | ||||
| -rw-r--r-- | media-sound/aqualung/aqualung-0.9_beta11-r2.ebuild | 5 | ||||
| -rw-r--r-- | media-sound/aqualung/files/aqualung-0.9_beta11-avcodec_max_audio_frame_size.patch | 31 |
3 files changed, 40 insertions, 3 deletions
diff --git a/media-sound/aqualung/ChangeLog b/media-sound/aqualung/ChangeLog index 707fb1e2475b..33fb1a84fdce 100644 --- a/media-sound/aqualung/ChangeLog +++ b/media-sound/aqualung/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-sound/aqualung # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/aqualung/ChangeLog,v 1.33 2014/01/28 16:33:04 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/aqualung/ChangeLog,v 1.34 2014/03/24 17:33:45 billie Exp $ + + 24 Mar 2014; Daniel Pielmeier <billie@gentoo.org> + aqualung-0.9_beta11-r2.ebuild, + +files/aqualung-0.9_beta11-avcodec_max_audio_frame_size.patch: + Fix bug #505330. Thanks to Bob Johnson for the report. 28 Jan 2014; Samuli Suominen <ssuominen@gentoo.org> -aqualung-0.9_beta11-r1.ebuild: diff --git a/media-sound/aqualung/aqualung-0.9_beta11-r2.ebuild b/media-sound/aqualung/aqualung-0.9_beta11-r2.ebuild index 4dd924c1ee7c..260f6445b73b 100644 --- a/media-sound/aqualung/aqualung-0.9_beta11-r2.ebuild +++ b/media-sound/aqualung/aqualung-0.9_beta11-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/aqualung/aqualung-0.9_beta11-r2.ebuild,v 1.6 2014/01/26 10:59:37 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/aqualung/aqualung-0.9_beta11-r2.ebuild,v 1.7 2014/03/24 17:33:45 billie Exp $ EAPI=5 @@ -53,7 +53,8 @@ src_prepare() { "${FILESDIR}"/${P}-ffmpeg.patch \ "${FILESDIR}"/${P}-libavformat54.patch \ "${FILESDIR}"/${P}-automake-1.13.patch \ - "${FILESDIR}"/${P}-libav9.patch + "${FILESDIR}"/${P}-libav9.patch \ + "${FILESDIR}"/${P}-avcodec_max_audio_frame_size.patch sed -i \ -e 's:$(pkgdatadir)/doc:/usr/share/doc/${PF}:' \ doc/Makefile.am || die diff --git a/media-sound/aqualung/files/aqualung-0.9_beta11-avcodec_max_audio_frame_size.patch b/media-sound/aqualung/files/aqualung-0.9_beta11-avcodec_max_audio_frame_size.patch new file mode 100644 index 000000000000..bc216d5c14ec --- /dev/null +++ b/media-sound/aqualung/files/aqualung-0.9_beta11-avcodec_max_audio_frame_size.patch @@ -0,0 +1,31 @@ +Index: src/decoder/dec_lavc.c +=================================================================== +--- src/decoder/dec_lavc.c (revision 1272) ++++ src/decoder/dec_lavc.c (revision 1273) +@@ -84,9 +84,9 @@ + file_decoder_t * fdec = dec->fdec; + + AVPacket packet; +- int16_t samples[AVCODEC_MAX_AUDIO_FRAME_SIZE]; +- float fsamples[AVCODEC_MAX_AUDIO_FRAME_SIZE]; +- int n_bytes = AVCODEC_MAX_AUDIO_FRAME_SIZE; ++ int16_t samples[MAX_AUDIO_FRAME_SIZE]; ++ float fsamples[MAX_AUDIO_FRAME_SIZE]; ++ int n_bytes = MAX_AUDIO_FRAME_SIZE; + + if (av_read_frame(pd->avFormatCtx, &packet) < 0) + return 1; +Index: src/decoder/dec_lavc.h +=================================================================== +--- src/decoder/dec_lavc.h (revision 1272) ++++ src/decoder/dec_lavc.h (revision 1273) +@@ -29,7 +29,8 @@ + #include "file_decoder.h" + + +-#define RB_LAVC_SIZE (3*AVCODEC_MAX_AUDIO_FRAME_SIZE) ++#define MAX_AUDIO_FRAME_SIZE 192000 // 1 second of 48khz 32bit audio ++#define RB_LAVC_SIZE (3*MAX_AUDIO_FRAME_SIZE) + + + typedef struct _lavc_pdata_t { |