Gentoo Archives: gentoo-commits

From: "Santiago M. Mola (coldwind)" <coldwind@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-sound/picard/files: picard-0.10-ffmpeg-avcodec_decode_audio2.patch
Date: Mon, 01 Dec 2008 21:19:34
Message-Id: E1L7GB2-0007V0-UU@stork.gentoo.org
1 coldwind 08/12/01 21:19:32
2
3 Added: picard-0.10-ffmpeg-avcodec_decode_audio2.patch
4 Log:
5 Fix bug #246148, thanks to Markus Rathgeb <maggu2810@×××.de>.
6 (Portage version: 2.2_rc16/cvs/Linux 2.6.27-gentoo-r2 x86_64)
7
8 Revision Changes Path
9 1.1 media-sound/picard/files/picard-0.10-ffmpeg-avcodec_decode_audio2.patch
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/picard/files/picard-0.10-ffmpeg-avcodec_decode_audio2.patch?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/picard/files/picard-0.10-ffmpeg-avcodec_decode_audio2.patch?rev=1.1&content-type=text/plain
13
14 Index: picard-0.10-ffmpeg-avcodec_decode_audio2.patch
15 ===================================================================
16 Source: Markus Rathgeb <maggu2810@×××.de>
17 Upstream: Applied in trunk, 0.11 will be fixed.
18 Reason: avcodec_decode_audio is deprecated in latest ffmpeg.
19 http://bugs.gentoo.org/show_bug.cgi?id=246148
20 http://forums.musicbrainz.org/viewtopic.php?id=1369
21 --- picard-0.10/picard/musicdns/avcodec.c.org 2008-11-09 12:47:41.000000000 +0100
22 +++ picard-0.10/picard/musicdns/avcodec.c 2008-11-09 12:47:49.000000000 +0100
23 @@ -278,7 +278,8 @@
24 data = packet.data;
25
26 while (size > 0) {
27 - len = avcodec_decode_audio(codec_context, (int16_t *)buffer_ptr, &output_size, data, size);
28 + output_size = buffer_size + AVCODEC_MAX_AUDIO_FRAME_SIZE;
29 + len = avcodec_decode_audio2(codec_context, (int16_t *)buffer_ptr, &output_size, data, size);
30
31 if (len < 0)
32 break;