Gentoo Archives: gentoo-commits

From: "Alexis Ballier (aballier)" <aballier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-sound/sox/files: sox-14.1.0-lavc.patch
Date: Wed, 01 Oct 2008 08:05:39
Message-Id: E1KkwiE-0005i6-UX@stork.gentoo.org
1 aballier 08/10/01 08:05:34
2
3 Added: sox-14.1.0-lavc.patch
4 Log:
5 add patch merged upstream fo fix build with latest ffmpeg
6 (Portage version: 2.2_rc11/cvs/Linux 2.6.26.5 x86_64)
7
8 Revision Changes Path
9 1.1 media-sound/sox/files/sox-14.1.0-lavc.patch
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/sox/files/sox-14.1.0-lavc.patch?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/sox/files/sox-14.1.0-lavc.patch?rev=1.1&content-type=text/plain
13
14 Index: sox-14.1.0-lavc.patch
15 ===================================================================
16 Index: sox-14.1.0/src/ffmpeg.c
17 ===================================================================
18 --- sox-14.1.0.orig/src/ffmpeg.c
19 +++ sox-14.1.0/src/ffmpeg.c
20 @@ -86,7 +86,11 @@ static int stream_component_open(priv_t
21
22 codec = avcodec_find_decoder(enc->codec_id);
23 enc->workaround_bugs = 1;
24 +#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
25 enc->error_resilience = 1;
26 +#else
27 + enc->error_recognition = 1;
28 +#endif
29 if (!codec || avcodec_open(enc, codec) < 0)
30 return -1;
31 if (enc->codec_type != CODEC_TYPE_AUDIO) {