- fix building with ffmpeg 4.0

- rel 2

diff --git a/ffmpeg4.patch b/ffmpeg4.patch
new file mode 100644 (file)
index 0000000..af70684
--- /dev/null
+++ b/ffmpeg4.patch
@@ -0,0 +1,20 @@
+--- libextractor-1.6/src/plugins/thumbnailffmpeg_extractor.c~  2017-10-15 21:21:23.000000000 +0200
++++ libextractor-1.6/src/plugins/thumbnailffmpeg_extractor.c   2018-04-29 22:57:40.989129194 +0200
+@@ -107,7 +107,7 @@
+ /**
+  * Number of bytes to feed to libav in one go, with padding (padding is zeroed).
+  */
+-#define PADDED_BUFFER_SIZE (BUFFER_SIZE + FF_INPUT_BUFFER_PADDING_SIZE)
++#define PADDED_BUFFER_SIZE (BUFFER_SIZE + AV_INPUT_BUFFER_PADDING_SIZE)
+ 
+ /**
+  * Global handle to MAGIC data.
+@@ -355,7 +355,7 @@
+    encoder_codec_ctx->mb_lmin = encoder_codec_ctx->qmin * FF_QP2LAMBDA;
+    encoder_codec_ctx->mb_lmax = encoder_codec_ctx->qmax * FF_QP2LAMBDA;
+ #endif
+-   encoder_codec_ctx->flags          = CODEC_FLAG_QSCALE;
++   encoder_codec_ctx->flags          = AV_CODEC_FLAG_QSCALE;
+    encoder_codec_ctx->global_quality = encoder_codec_ctx->qmin * FF_QP2LAMBDA;
+ 
+    dst_frame->pts     = 1;

diff --git a/libextractor.spec b/libextractor.spec
index eebc952bb632f77a70137998f72275fb5642a844..7de5d89bf2886aedd2665f9ca4e8d55833d0d4ce 100644 (file)
--- a/libextractor.spec
+++ b/libextractor.spec
@@ -10,7 +10,7 @@ Summary:      Meta-data extraction library
 Summary(pl.UTF-8):     Biblioteka do ekstrakcji metadanych
 Name:          libextractor
 Version:       1.6
-Release:       1
+Release:       2
 License:       GPL v3+
 Group:         Libraries
 Source0:       http://ftp.gnu.org/gnu/libextractor/%{name}-%{version}.tar.gz
@@ -18,6 +18,7 @@ Source0:      http://ftp.gnu.org/gnu/libextractor/%{name}-%{version}.tar.gz
 Patch0:                %{name}-info.patch
 Patch1:                %{name}-rpm5.patch
 Patch2:                %{name}-pl.po-update.patch
+Patch3:                ffmpeg4.patch
 URL:           http://www.gnu.org/software/libextractor/
 BuildRequires: autoconf >= 2.61
 BuildRequires: automake >= 1:1.11
@@ -166,6 +167,7 @@ Statyczna wersja bibliotek libextractor.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %{__rm} po/stamp-po