Gentoo Archives: gentoo-commits

From: "Tomas Chvatal (scarabeus)" <scarabeus@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-libs/gegl/files: 0.1.6-ffmpeg.patch
Date: Sun, 01 May 2011 16:22:13
Message-Id: 20110501162203.DCF3820054@flycatcher.gentoo.org
1 scarabeus 11/05/01 16:22:03
2
3 Added: 0.1.6-ffmpeg.patch
4 Log:
5 Add patch to compile even with latest ffmpeg api.
6
7 (Portage version: 2.2.0_alpha30/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.1 media-libs/gegl/files/0.1.6-ffmpeg.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/gegl/files/0.1.6-ffmpeg.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/gegl/files/0.1.6-ffmpeg.patch?rev=1.1&content-type=text/plain
14
15 Index: 0.1.6-ffmpeg.patch
16 ===================================================================
17 diff -urN gegl-0.1.6.old/operations/external/ff-load.c gegl-0.1.6/operations/external/ff-load.c
18 --- gegl-0.1.6.old/operations/external/ff-load.c 2011-05-01 18:10:42.000000000 +0200
19 +++ gegl-0.1.6/operations/external/ff-load.c 2011-05-01 18:15:58.000000000 +0200
20 @@ -69,7 +69,7 @@
21 {
22 switch (err)
23 {
24 - case AVERROR_NUMEXPECTED:
25 + case AVERROR(EINVAL):
26 g_warning ("%s: Incorrect image filename syntax.\n"
27 "Use '%%d' to specify the image number:\n"
28 " for img1.jpg, img2.jpg, ..., use 'img%%d.jpg';\n"
29 @@ -79,7 +79,7 @@
30 case AVERROR_INVALIDDATA:
31 g_warning ("%s: Error while parsing header\n", filename);
32 break;
33 - case AVERROR_NOFMT:
34 + case AVERROR(EILSEQ):
35 g_warning ("%s: Unknown format\n", filename);
36 break;
37 default:
38 @@ -278,7 +278,7 @@
39 for (i = 0; i< p->ic->nb_streams; i++)
40 {
41 AVCodecContext *c = p->ic->streams[i]->codec;
42 - if (c->codec_type == CODEC_TYPE_VIDEO)
43 + if (c->codec_type == AVMEDIA_TYPE_VIDEO)
44 {
45 p->video_st = p->ic->streams[i];
46 p->video_stream = i;