blob: 92cad26c9335b562241ededf5fd4b704ef19581e (
plain)
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
|
commit 810a0235837d6f31d8b3c05544f99461df71403e
Author: Larry Gritz <lg@larrygritz.com>
Date: Mon Apr 23 15:50:14 2018 -0700
Changes to allow building against the new ffmpeg 4.0 (#1926)
diff --git a/src/ffmpeg.imageio/ffmpeginput.cpp b/src/ffmpeg.imageio/ffmpeginput.cpp
index 4e0cb3b9..548ddba4 100644
--- a/src/ffmpeg.imageio/ffmpeginput.cpp
+++ b/src/ffmpeg.imageio/ffmpeginput.cpp
@@ -124,6 +124,15 @@ inline int receive_frame(AVCodecContext *avctx, AVFrame *picture,
}
#endif
+
+// Changes for ffmpeg 4.0
+#define USE_FFMPEG_4_0 (LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(58, 18, 100))
+
+#if USE_FFMPEG_4_0
+# define CODEC_CAP_DELAY AV_CODEC_CAP_DELAY
+#endif
+
+
#include <boost/thread/once.hpp>
#include <OpenImageIO/imageio.h>
|
