summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Huber <johu@gentoo.org>2017-03-09 18:21:43 +0100
committerJohannes Huber <johu@gentoo.org>2017-03-09 18:22:15 +0100
commit656e91b0a057177209128fe0cb84cd7fd8e002b5 (patch)
treeced6347efd7cd395b7bcee6fbfdce6b300d95a09 /app-cdr/k3b/files/k3b-2.0.3-ffmpeg-3.patch
parentapp-arch/pigz: sparc stable (diff)
downloadgentoo-656e91b0a057177209128fe0cb84cd7fd8e002b5.tar.gz
gentoo-656e91b0a057177209128fe0cb84cd7fd8e002b5.tar.bz2
gentoo-656e91b0a057177209128fe0cb84cd7fd8e002b5.zip
app-cdr/k3b -> kde-apps/k3b
Diffstat (limited to 'app-cdr/k3b/files/k3b-2.0.3-ffmpeg-3.patch')
-rw-r--r--app-cdr/k3b/files/k3b-2.0.3-ffmpeg-3.patch27
1 files changed, 0 insertions, 27 deletions
diff --git a/app-cdr/k3b/files/k3b-2.0.3-ffmpeg-3.patch b/app-cdr/k3b/files/k3b-2.0.3-ffmpeg-3.patch
deleted file mode 100644
index 5a06503304a..00000000000
--- a/app-cdr/k3b/files/k3b-2.0.3-ffmpeg-3.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 5b9b3537b658ad342d688fa4f210113a3d066d2a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Old=C5=99ich=20Jedli=C4=8Dka?= <oldium.pro@seznam.cz>
-Date: Sat, 14 Feb 2015 15:31:07 +0100
-Subject: Fixed compilation with newer ffmpeg/libav.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Oldřich Jedlička <oldium.pro@seznam.cz>
----
- plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp | 64 ++++++++++++++++++++++++-----
- 1 file changed, 54 insertions(+), 10 deletions(-)
-
---- a/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp.old 2017-02-12 21:09:02.258453125 +0100
-+++ b/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp 2017-02-12 21:12:44.799077359 +0100
-@@ -378,7 +378,11 @@
- #endif
-
- if( d->packetSize <= 0 || len < 0 )
-+#if LIBAVCODEC_VERSION_MAJOR >= 56
-+ ::av_packet_unref( &d->packet );
-+#else
- ::av_free_packet( &d->packet );
-+#endif
- if( len < 0 ) {
- kDebug() << "(K3bFFMpegFile) decoding failed for " << m_filename;
- return -1;