- fix building with ffmpeg 4.0

- rel 5

diff --git a/OpenImageIO.spec b/OpenImageIO.spec
index 9ec36de65c36969e398e5f5b140af8f34a2576c4..277b8b227ed4eb0a03c0ce7c61e9d6773fb66fb7 100644 (file)
--- a/OpenImageIO.spec
+++ b/OpenImageIO.spec
@@ -17,7 +17,7 @@ Summary:      Library for reading and writing images
 Summary(pl.UTF-8):     Biblioteka do odczytu i zapisu obrazów
 Name:          OpenImageIO
 Version:       1.7.11
-Release:       4
+Release:       5
 License:       BSD
 Group:         Libraries
 Source0:       https://github.com/OpenImageIO/oiio/tarball/Release-%{version}/%{name}-%{version}.tar.gz
@@ -26,6 +26,7 @@ Patch0:               %{name}-link.patch
 Patch1:                %{name}-system-squish.patch
 Patch2:                %{name}-system-dpx.patch
 Patch3:                %{name}-system-libcineon.patch
+Patch4:                ffmpeg4.patch
 URL:           https://sites.google.com/site/openimageio/home
 BuildRequires: Field3D-devel
 %{?with_ocio:BuildRequires:    OpenColorIO-devel}
@@ -343,6 +344,7 @@ Wiązanie Pythona do biblioteki OpenImageIO.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %{__rm} -r src/dds.imageio/squish
 # when using system pugixml, don't use hacked headers

diff --git a/ffmpeg4.patch b/ffmpeg4.patch
new file mode 100644 (file)
index 0000000..c9412e9
--- /dev/null
+++ b/ffmpeg4.patch
@@ -0,0 +1,11 @@
+--- OpenImageIO-oiio-6950fb8/src/ffmpeg.imageio/ffmpeginput.cpp~       2017-02-01 00:23:29.000000000 +0100
++++ OpenImageIO-oiio-6950fb8/src/ffmpeg.imageio/ffmpeginput.cpp        2018-04-29 01:14:22.655631461 +0200
+@@ -330,7 +330,7 @@
+         !strcmp (m_codec_context->codec->name, "dvvideo")) {
+         m_offset_time = false;
+     }
+-    m_codec_cap_delay = (bool) (m_codec_context->codec->capabilities & CODEC_CAP_DELAY);
++    m_codec_cap_delay = (bool) (m_codec_context->codec->capabilities & AV_CODEC_CAP_DELAY);
+ 
+     AVStream *stream = m_format_context->streams[m_video_stream];
+     if (stream->r_frame_rate.num != 0 && stream->r_frame_rate.den != 0) {