- fix building with ffmpeg 4.0

- rel 18

diff --git a/ffmpeg4.patch b/ffmpeg4.patch
new file mode 100644 (file)
index 0000000..d60f54e
--- /dev/null
+++ b/ffmpeg4.patch
@@ -0,0 +1,11 @@
+--- gtatool-2.0.1/src/conv-ffmpeg/media_object.cpp~    2018-04-29 18:57:24.000000000 +0200
++++ gtatool-2.0.1/src/conv-ffmpeg/media_object.cpp     2018-04-29 18:59:29.051110754 +0200
+@@ -908,8 +908,6 @@
+ #ifdef FF_API_LOWRES
+             lowres = codec_ctx->lowres;
+ #endif
+-            if (lowres || (codec && (codec->capabilities & CODEC_CAP_DR1)))
+-                codec_ctx->flags |= CODEC_FLAG_EMU_EDGE;
+         }
+         // Find and open the codec. AV_CODEC_ID_TEXT is a special case: it has no decoder since it is unencoded raw data.
+         if (codec_ctx->codec_id != AV_CODEC_ID_TEXT && (!codec || (e = avcodec_open2(codec_ctx, codec, NULL)) < 0))

diff --git a/gtatool.spec b/gtatool.spec
index e3d7c7a75517a579c6cb214860918c1b5bda214e..2e61a8a5fc9e44869a8e09adbb6f6e2e2d1bc67c 100644 (file)
--- a/gtatool.spec
+++ b/gtatool.spec
@@ -24,7 +24,7 @@ Summary:      Tools to manipulate Generic Tagged Array (GTA) files
 Summary(pl.UTF-8):     Narzędzia do obróbki plików GTA (ogólnych tablic etykietowanych)
 Name:          gtatool
 Version:       2.0.1
-Release:       17
+Release:       18
 License:       GPL v3+
 Group:         Applications/File
 Source0:       http://download.savannah.gnu.org/releases/gta/%{name}-%{version}.tar.xz
@@ -35,6 +35,7 @@ Patch2:               %{name}-bashcomp.patch
 Patch3:                pfstools2.patch
 Patch4:                ffmpeg3.patch
 Patch5:                imagemagick7.patch
+Patch6:                ffmpeg4.patch
 URL:           http://gta.nongnu.org/gtatool.html
 %{?with_magick:BuildRequires:  ImageMagick-c++-devel}
 %{?with_openexr:BuildRequires: OpenEXR-devel}
@@ -290,6 +291,7 @@ Bashowe uzupełnianie parametrów programu gtatool.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 %build
 %{__libtoolize}