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