1 |
scarabeus 11/05/04 19:49:31 |
2 |
|
3 |
Modified: 0.1.6-ffmpeg.patch |
4 |
Log: |
5 |
Convert to unix line endings. Hopefuly this should fix patch not applying. |
6 |
|
7 |
(Portage version: 2.2.0_alpha30/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.3 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.3&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/gegl/files/0.1.6-ffmpeg.patch?rev=1.3&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/gegl/files/0.1.6-ffmpeg.patch?r1=1.2&r2=1.3 |
15 |
|
16 |
Index: 0.1.6-ffmpeg.patch |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/media-libs/gegl/files/0.1.6-ffmpeg.patch,v |
19 |
retrieving revision 1.2 |
20 |
retrieving revision 1.3 |
21 |
diff -u -r1.2 -r1.3 |
22 |
--- 0.1.6-ffmpeg.patch 4 May 2011 13:17:52 -0000 1.2 |
23 |
+++ 0.1.6-ffmpeg.patch 4 May 2011 19:49:31 -0000 1.3 |
24 |
@@ -1,33 +1,33 @@ |
25 |
-diff -urN gegl-0.1.6.old//operations/external/ff-load.c gegl-0.1.6/operations/external/ff-load.c |
26 |
---- gegl-0.1.6.old//operations/external/ff-load.c 2011-01-24 19:03:30.000000000 -0300 |
27 |
-+++ gegl-0.1.6/operations/external/ff-load.c 2011-05-04 09:59:48.910379742 -0300 |
28 |
-@@ -69,17 +69,17 @@ |
29 |
- { |
30 |
- switch (err) |
31 |
- { |
32 |
-- case AVERROR_NUMEXPECTED: |
33 |
-+ case AVERROR(EDOM): |
34 |
- g_warning ("%s: Incorrect image filename syntax.\n" |
35 |
- "Use '%%d' to specify the image number:\n" |
36 |
- " for img1.jpg, img2.jpg, ..., use 'img%%d.jpg';\n" |
37 |
- " for img001.jpg, img002.jpg, ..., use 'img%%03d.jpg'.\n", |
38 |
- filename); |
39 |
- break; |
40 |
-- case AVERROR_INVALIDDATA: |
41 |
-+ case AVERROR(EINVAL): |
42 |
- g_warning ("%s: Error while parsing header\n", filename); |
43 |
- break; |
44 |
-- case AVERROR_NOFMT: |
45 |
-+ case AVERROR(EILSEQ): |
46 |
- g_warning ("%s: Unknown format\n", filename); |
47 |
- break; |
48 |
- default: |
49 |
-@@ -278,7 +278,7 @@ |
50 |
- for (i = 0; i< p->ic->nb_streams; i++) |
51 |
- { |
52 |
- AVCodecContext *c = p->ic->streams[i]->codec; |
53 |
-- if (c->codec_type == CODEC_TYPE_VIDEO) |
54 |
-+ if (c->codec_type == AVMEDIA_TYPE_VIDEO) |
55 |
- { |
56 |
- p->video_st = p->ic->streams[i]; |
57 |
- p->video_stream = i; |
58 |
+diff -urN gegl-0.1.6.old//operations/external/ff-load.c gegl-0.1.6/operations/external/ff-load.c |
59 |
+--- gegl-0.1.6.old//operations/external/ff-load.c 2011-01-24 19:03:30.000000000 -0300 |
60 |
++++ gegl-0.1.6/operations/external/ff-load.c 2011-05-04 09:59:48.910379742 -0300 |
61 |
+@@ -69,17 +69,17 @@ |
62 |
+ { |
63 |
+ switch (err) |
64 |
+ { |
65 |
+- case AVERROR_NUMEXPECTED: |
66 |
++ case AVERROR(EDOM): |
67 |
+ g_warning ("%s: Incorrect image filename syntax.\n" |
68 |
+ "Use '%%d' to specify the image number:\n" |
69 |
+ " for img1.jpg, img2.jpg, ..., use 'img%%d.jpg';\n" |
70 |
+ " for img001.jpg, img002.jpg, ..., use 'img%%03d.jpg'.\n", |
71 |
+ filename); |
72 |
+ break; |
73 |
+- case AVERROR_INVALIDDATA: |
74 |
++ case AVERROR(EINVAL): |
75 |
+ g_warning ("%s: Error while parsing header\n", filename); |
76 |
+ break; |
77 |
+- case AVERROR_NOFMT: |
78 |
++ case AVERROR(EILSEQ): |
79 |
+ g_warning ("%s: Unknown format\n", filename); |
80 |
+ break; |
81 |
+ default: |
82 |
+@@ -278,7 +278,7 @@ |
83 |
+ for (i = 0; i< p->ic->nb_streams; i++) |
84 |
+ { |
85 |
+ AVCodecContext *c = p->ic->streams[i]->codec; |
86 |
+- if (c->codec_type == CODEC_TYPE_VIDEO) |
87 |
++ if (c->codec_type == AVMEDIA_TYPE_VIDEO) |
88 |
+ { |
89 |
+ p->video_st = p->ic->streams[i]; |
90 |
+ p->video_stream = i; |