diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-11-02 10:47:02 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-11-02 10:47:02 -0300 |
| commit | 40e1222c1402c0d2aded73b95802f8197d0691a6 (patch) | |
| tree | e1bf1a01ae7443e4a9f460200dad9580565b27c7 /staging/gegl/0.1.6-ffmpeg.patch | |
| parent | 3e3dd870121c91097220248a601578b92d332f2b (diff) | |
| parent | 37a1064b8105764414f279ced442e6ba2f63bea1 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/camlp5/PKGBUILD
community/dzen2/PKGBUILD
extra/boost/PKGBUILD
extra/libxmi/PKGBUILD
extra/mesa/PKGBUILD
multilib/lib32-mesa/PKGBUILD
Diffstat (limited to 'staging/gegl/0.1.6-ffmpeg.patch')
| -rw-r--r-- | staging/gegl/0.1.6-ffmpeg.patch | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/staging/gegl/0.1.6-ffmpeg.patch b/staging/gegl/0.1.6-ffmpeg.patch new file mode 100644 index 000000000..51fb95d28 --- /dev/null +++ b/staging/gegl/0.1.6-ffmpeg.patch @@ -0,0 +1,33 @@ +diff -urN gegl-0.1.6.old//operations/external/ff-load.c gegl-0.1.6/operations/external/ff-load.c +--- gegl-0.1.6.old//operations/external/ff-load.c 2011-01-24 19:03:30.000000000 -0300 ++++ gegl-0.1.6/operations/external/ff-load.c 2011-05-04 09:59:48.910379742 -0300 +@@ -69,17 +69,17 @@ + { + switch (err) + { +- case AVERROR_NUMEXPECTED: ++ case AVERROR(EDOM): + g_warning ("%s: Incorrect image filename syntax.\n" + "Use '%%d' to specify the image number:\n" + " for img1.jpg, img2.jpg, ..., use 'img%%d.jpg';\n" + " for img001.jpg, img002.jpg, ..., use 'img%%03d.jpg'.\n", + filename); + break; +- case AVERROR_INVALIDDATA: ++ case AVERROR(EINVAL): + g_warning ("%s: Error while parsing header\n", filename); + break; +- case AVERROR_NOFMT: ++ case AVERROR(EILSEQ): + g_warning ("%s: Unknown format\n", filename); + break; + default: +@@ -278,7 +278,7 @@ + for (i = 0; i< p->ic->nb_streams; i++) + { + AVCodecContext *c = p->ic->streams[i]->codec; +- if (c->codec_type == CODEC_TYPE_VIDEO) ++ if (c->codec_type == AVMEDIA_TYPE_VIDEO) + { + p->video_st = p->ic->streams[i]; + p->video_stream = i; |