1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
|
From 8f2545886ce3be8f1b1229bddcfa5af3216110d3 Mon Sep 17 00:00:00 2001
From: Franz Brausse <brausse@informatik.uni-trier.de>
Date: Sun, 6 May 2018 13:38:09 +0200
Subject: operations/external/ff-save: ffmpeg-4.0 compat; fixes #795625
---
operations/external/ff-save.c | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/operations/external/ff-save.c b/operations/external/ff-save.c
index 90b6162..e7edd3e 100644
--- a/operations/external/ff-save.c
+++ b/operations/external/ff-save.c
@@ -88,6 +88,11 @@ property_int (me_subpel_quality, _("me-subpel-quality"), 0)
#include <libavutil/opt.h>
#include <libswscale/swscale.h>
+/* remove if libavcodec_required_version is changed to > 56.41.100 */
+#if LIBAVCODEC_VERSION_INT <= AV_VERSION_INT(56,41,100)
+# define AV_CODEC_FLAG_GLOBAL_HEADER CODEC_FLAG_GLOBAL_HEADER
+#endif
+
typedef struct
{
gdouble frame;
@@ -290,7 +295,7 @@ add_audio_stream (GeglProperties *o, AVFormatContext * oc, int codec_id)
c->codec_type = AVMEDIA_TYPE_AUDIO;
if (oc->oformat->flags & AVFMT_GLOBALHEADER)
- c->flags |= CODEC_FLAG_GLOBAL_HEADER;
+ c->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
return st;
}
@@ -699,7 +704,9 @@ open_video (GeglProperties *o, AVFormatContext * oc, AVStream * st)
}
p->video_outbuf = NULL;
+#if (LIBAVFORMAT_VERSION_MAJOR < 58) /* AVFMT_RAWPICTURE got removed from ffmpeg: "not used anymore" */
if (!(oc->oformat->flags & AVFMT_RAWPICTURE))
+#endif
{
/* allocate output buffer, 1 mb / frame, might fail for some codecs on UHD - but works for now */
p->video_outbuf_size = 1024 * 1024;
@@ -803,6 +810,7 @@ write_video_frame (GeglProperties *o,
picture_ptr = p->picture;
picture_ptr->pts = p->frame_count;
+ #if (LIBAVFORMAT_VERSION_MAJOR < 58) /* AVFMT_RAWPICTURE got removed from ffmpeg: "not used anymore" */
if (oc->oformat->flags & AVFMT_RAWPICTURE)
{
/* raw video case. The API will change slightly in the near
@@ -821,6 +829,7 @@ write_video_frame (GeglProperties *o,
ret = av_write_frame (oc, &pkt);
}
else
+#endif
{
/* encode the image */
AVPacket pkt2;
--
cgit v0.12
|
