diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2018-09-16 10:14:34 +0200 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2018-09-16 10:17:32 +0200 |
| commit | fc10c10272774119fe1d518101197b897e91ae8c (patch) | |
| tree | 0e144f5d837c2563cb56229ce285e02bdd323ef6 /media-libs/qtav/files | |
| parent | dev-libs/libgcrypt: sh/m68k stable wrt bug #658056 (diff) | |
| download | gentoo-fc10c10272774119fe1d518101197b897e91ae8c.tar.gz gentoo-fc10c10272774119fe1d518101197b897e91ae8c.tar.bz2 gentoo-fc10c10272774119fe1d518101197b897e91ae8c.zip | |
media-libs/qtav: Fix build with ffmpeg-4
Closes: https://bugs.gentoo.org/660852
Package-Manager: Portage-2.3.49, Repoman-2.3.10
Diffstat (limited to 'media-libs/qtav/files')
| -rw-r--r-- | media-libs/qtav/files/qtav-1.12.0-ffmpeg-4.patch | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/media-libs/qtav/files/qtav-1.12.0-ffmpeg-4.patch b/media-libs/qtav/files/qtav-1.12.0-ffmpeg-4.patch new file mode 100644 index 000000000000..cb77e9adebb2 --- /dev/null +++ b/media-libs/qtav/files/qtav-1.12.0-ffmpeg-4.patch @@ -0,0 +1,36 @@ +From 1633f2962e195eb2a013072e694a2e1c701613a8 Mon Sep 17 00:00:00 2001 +From: 0xFelix <evostar@gmx.de> +Date: Tue, 12 Dec 2017 13:24:34 +0100 +Subject: [PATCH] Remove usage of deprecated avfiltergraph.h header + +avfiltergraph.h was replaced by avfilter.h in libavfilter version +3.8.0+ so only include it when the used libavfilter version +is older than 3.8.0 +--- + src/QtAV/private/AVCompat.h | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/QtAV/private/AVCompat.h b/src/QtAV/private/AVCompat.h +index 6c38596d1..944cfd7de 100644 +--- a/src/QtAV/private/AVCompat.h ++++ b/src/QtAV/private/AVCompat.h +@@ -59,6 +59,7 @@ extern "C" + #include <libavutil/parseutils.h> + #include <libavutil/pixdesc.h> + #include <libavutil/avstring.h> ++#include <libavfilter/version.h> + + #if !FFMPEG_MODULE_CHECK(LIBAVUTIL, 51, 73, 101) + #include <libavutil/channel_layout.h> +@@ -79,8 +80,11 @@ extern "C" + #endif //QTAV_HAVE(AVRESAMPLE) + + #if QTAV_HAVE(AVFILTER) ++#if LIBAVFILTER_VERSION_INT < AV_VERSION_INT(3,8,0) + #include <libavfilter/avfiltergraph.h> /*code is here for old version*/ ++#else + #include <libavfilter/avfilter.h> ++#endif + #include <libavfilter/buffersink.h> + #include <libavfilter/buffersrc.h> + #endif //QTAV_HAVE(AVFILTER) |