[SCM] ffmpegthumbs packaging branch, master, updated. debian/15.12.0-2-3-g2d1fd11

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ffmpegthumbs.git;a=commitdiff;h=a1c4515

The following commit has been merged in the master branch:
commit a1c4515700db6edb54fd2ff1d6c9a8d282d5538b
Author: Automatic packaging <maxy+jenkins at gnuservers.com.ar>
Date:   Wed Jun 15 01:53:15 2016 +0200

    Refresh patches
---
 debian/patches/upstream_port_to_libavfilter.patch | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/debian/patches/upstream_port_to_libavfilter.patch b/debian/patches/upstream_port_to_libavfilter.patch
index 12190ae..0bdc4c4 100644
--- a/debian/patches/upstream_port_to_libavfilter.patch
+++ b/debian/patches/upstream_port_to_libavfilter.patch
@@ -1,3 +1,7 @@
+From: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
+Date: Wed, 15 Jun 2016 01:53:13 +0200
+Subject: upstream_port_to_libavfilter
+
 commit 3978c762072b7bc16b2096819b7cfa2052deaf5e
 Author: Martin T. H. Sandsmark <martin.sandsmark at kde.org>
 Date:   Fri May 27 22:29:11 2016 +0200
@@ -6,9 +10,16 @@ Date:   Fri May 27 22:29:11 2016 +0200
     
     Based on a patch from Andreas Cadhalpun
     <andreas.cadhalpun at googlemail.com>.
+---
+ CMakeLists.txt                     |   2 +-
+ cmake/FindFFmpeg.cmake             |   1 +
+ ffmpegthumbnailer/moviedecoder.cpp | 117 +++++++++++++++++++++++++++++++++----
+ ffmpegthumbnailer/moviedecoder.h   |  18 +++++-
+ tests/CMakeLists.txt               |   2 +-
+ 5 files changed, 124 insertions(+), 16 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 48eed64..3c761fa 100644
+index 7a025d4..1fab769 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -36,7 +36,7 @@ set( ffmpegthumbs_PART_SRCS

-- 
ffmpegthumbs packaging