aboutsummaryrefslogtreecommitdiff
path: root/graphics/gegl
diff options
context:
space:
mode:
authorJan Beich <jbeich@FreeBSD.org>2018-04-24 13:56:29 +0000
committerJan Beich <jbeich@FreeBSD.org>2018-04-24 13:56:29 +0000
commit41b40a846cd62044c5e7eafab5f2c6c304c4f3af (patch)
tree103f219128619fb7e66ac2dfa8007e068d162a97 /graphics/gegl
parent369898f6334c7e599d0d13f1e3cc8ae1befd156c (diff)
graphics/gegl: unbreak with ffmpeg 4.0
./ff-load.c:312:36: error: use of undeclared identifier 'CODEC_CAP_TRUNCATED' if (p->codec->capabilities & CODEC_CAP_TRUNCATED) ^ ./ff-load.c:313:26: error: use of undeclared identifier 'CODEC_FLAG_TRUNCATED' p->enc->flags |= CODEC_FLAG_TRUNCATED; PR: 227726
Notes
Notes: svn path=/head/; revision=468203
Diffstat (limited to 'graphics/gegl')
-rw-r--r--graphics/gegl/files/patch-operations_external_ff-load.c12
1 files changed, 9 insertions, 3 deletions
diff --git a/graphics/gegl/files/patch-operations_external_ff-load.c b/graphics/gegl/files/patch-operations_external_ff-load.c
index 93950d939beb..96d60708d5e3 100644
--- a/graphics/gegl/files/patch-operations_external_ff-load.c
+++ b/graphics/gegl/files/patch-operations_external_ff-load.c
@@ -1,5 +1,6 @@
https://git.gnome.org/browse/gegl/commit/?id=97067622352e
https://git.gnome.org/browse/gegl/commit/?id=6d50c42e2c9a
+https://git.gnome.org/browse/gegl/commit/?id=67f14cbbc5d1
--- operations/external/ff-load.c.orig 2012-04-01 11:17:57 UTC
+++ operations/external/ff-load.c
@@ -39,9 +40,14 @@ https://git.gnome.org/browse/gegl/commit/?id=6d50c42e2c9a
if (err < 0)
{
g_warning ("ff-load: error finding stream info for %s", o->path);
-@@ -312,7 +312,7 @@ prepare (GeglOperation *operation)
- if (p->codec->capabilities & CODEC_CAP_TRUNCATED)
- p->enc->flags |= CODEC_FLAG_TRUNCATED;
+@@ -309,10 +309,10 @@ prepare (GeglOperation *operation)
+ g_warning ("codec not found");
+ }
+
+- if (p->codec->capabilities & CODEC_CAP_TRUNCATED)
+- p->enc->flags |= CODEC_FLAG_TRUNCATED;
++ if (p->codec->capabilities & AV_CODEC_CAP_TRUNCATED)
++ p->enc->flags |= AV_CODEC_FLAG_TRUNCATED;
- if (avcodec_open (p->enc, p->codec) < 0)
+ if (avcodec_open2 (p->enc, p->codec, NULL) < 0)