Gentoo Archives: gentoo-commits

From: "Luca Barbato (lu_zero)" <lu_zero@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-sound/sox/files: sox-14.4.0-libav-9.patch
Date: Sun, 25 Nov 2012 21:12:42
Message-Id: 20121125211232.586DB20C65@flycatcher.gentoo.org
1 lu_zero 12/11/25 21:12:32
2
3 Added: sox-14.4.0-libav-9.patch
4 Log:
5 Support libav-9
6
7 (Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key 1191738E)
8
9 Revision Changes Path
10 1.1 media-sound/sox/files/sox-14.4.0-libav-9.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/sox/files/sox-14.4.0-libav-9.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/sox/files/sox-14.4.0-libav-9.patch?rev=1.1&content-type=text/plain
14
15 Index: sox-14.4.0-libav-9.patch
16 ===================================================================
17 diff -burN sox-14.4.0.old//src/ffmpeg.c sox-14.4.0/src/ffmpeg.c
18 --- sox-14.4.0.old//src/ffmpeg.c 2012-11-25 21:59:45.990825656 +0100
19 +++ sox-14.4.0/src/ffmpeg.c 2012-11-25 22:07:06.436809624 +0100
20 @@ -98,7 +98,7 @@
21 ic->error_recognition = 1;
22 #endif
23
24 - if (!codec || avcodec_open(enc, codec) < 0)
25 + if (!codec || avcodec_open2(enc, codec, NULL) < 0)
26 return -1;
27 if (enc->codec_type != AVMEDIA_TYPE_AUDIO) {
28 lsx_fail("ffmpeg CODEC %x is not an audio CODEC", enc->codec_type);
29 @@ -180,7 +180,7 @@
30 }
31
32 /* Get CODEC parameters */
33 - if ((ret = av_find_stream_info(ffmpeg->ctxt)) < 0) {
34 + if ((ret = avformat_find_stream_info(ffmpeg->ctxt, NULL)) < 0) {
35 lsx_fail("ffmpeg could not find CODEC parameters for %s", ft->filename);
36 return SOX_EOF;
37 }
38 @@ -274,7 +274,7 @@
39 AVCodecContext *c;
40 AVStream *st;
41
42 - st = av_new_stream(oc, 1);
43 + st = avformat_new_stream(oc, NULL);
44 if (!st) {
45 lsx_fail("ffmpeg could not alloc stream");
46 return NULL;
47 @@ -308,7 +308,7 @@
48 }
49
50 /* open it */
51 - if (avcodec_open(c, codec) < 0) {
52 + if (avcodec_open2(c, codec, NULL) < 0) {
53 lsx_fail("ffmpeg could not open CODEC");
54 return SOX_EOF;
55 }