diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-01-12 16:58:08 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-01-12 16:58:08 +0000 |
| commit | c8a77dfe4d3d307c1d5dd2650b7297447d8b609d (patch) | |
| tree | 9ea78393bc3ecd6ab4de449383d4e97e5f3648ae /media-libs/openimageio/files | |
| parent | 2891d29af8907ce881662f4a02844926d7a293c7 (diff) | |
gentoo resync : 12.01.2019
Diffstat (limited to 'media-libs/openimageio/files')
| -rw-r--r-- | media-libs/openimageio/files/openimageio-1.8.7-ffmpeg4.patch | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/media-libs/openimageio/files/openimageio-1.8.7-ffmpeg4.patch b/media-libs/openimageio/files/openimageio-1.8.7-ffmpeg4.patch deleted file mode 100644 index 92cad26c9335..000000000000 --- a/media-libs/openimageio/files/openimageio-1.8.7-ffmpeg4.patch +++ /dev/null @@ -1,26 +0,0 @@ -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> |