summaryrefslogtreecommitdiff
path: root/extra/gegl/gegl-0.2.0-ffmpeg-0.11.diff
diff options
context:
space:
mode:
Diffstat (limited to 'extra/gegl/gegl-0.2.0-ffmpeg-0.11.diff')
-rw-r--r--extra/gegl/gegl-0.2.0-ffmpeg-0.11.diff15
1 files changed, 12 insertions, 3 deletions
diff --git a/extra/gegl/gegl-0.2.0-ffmpeg-0.11.diff b/extra/gegl/gegl-0.2.0-ffmpeg-0.11.diff
index a33ec6f7f..02fe77702 100644
--- a/extra/gegl/gegl-0.2.0-ffmpeg-0.11.diff
+++ b/extra/gegl/gegl-0.2.0-ffmpeg-0.11.diff
@@ -1,12 +1,21 @@
-diff -Naur gegl-0.2.0/operations/external/ff-load.c gegl-0.2.0-1/operations/external/ff-load.c
+diff -u -r gegl-0.2.0/operations/external/ff-load.c gegl-0.2.0-1/operations/external/ff-load.c
--- gegl-0.2.0/operations/external/ff-load.c 2012-04-01 13:17:57.000000000 +0200
-+++ gegl-0.2.0-1/operations/external/ff-load.c 2012-07-11 12:42:05.174756560 +0200
++++ gegl-0.2.0-1/operations/external/ff-load.c 2013-10-20 03:22:06.824278863 +0200
@@ -271,7 +271,7 @@
gint err;
ff_cleanup (o);
- err = av_open_input_file (&p->ic, o->path, NULL, 0, NULL);
-+err = avformat_open_input (&p->ic, o->path, NULL, NULL);
++ err = avformat_open_input (&p->ic, o->path, NULL, NULL);
if (err < 0)
{
print_error (o->path, err);
+@@ -312,7 +312,7 @@
+ if (p->codec->capabilities & CODEC_CAP_TRUNCATED)
+ p->enc->flags |= CODEC_FLAG_TRUNCATED;
+
+- if (avcodec_open (p->enc, p->codec) < 0)
++ if (avcodec_open2 (p->enc, p->codec, NULL) < 0)
+ {
+ g_warning ("error opening codec %s", p->enc->codec->name);
+ return;