[SCM] MLT multimedia framework packaging branch, master, updated. debian/6.4.1-6-13-ga2da7dd

[Patrick Matthäi]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/krap/mlt.git;a=commitdiff;h=5c01d71

The following commit has been merged in the master branch:
commit 5c01d71ac3981bee2dd51b2007578c3c827e5458
Author: Patrick Matthäi <pmatthaei at debian.org>
Date:   Wed Jan 24 09:55:36 2018 +0100

    - Remove merged patch 04-allow-repository_deletion_without_side_effect.
---
 debian/changelog                                   |  1 +
 ...ow-repository_deletion_without_side_effect.diff | 24 ----------------------
 2 files changed, 1 insertion(+), 24 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 723ebea..66aae3b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ mlt (6.6.0-1) UNRELEASED; urgency=medium
     - Remove merged patch 01-crash-affine.
     - Remove merged patch 02-crash-clipinfo-update.
     - Remove merged patch 03-use-external-libebur.
+    - Remove merged patch 04-allow-repository_deletion_without_side_effect.
 
  -- Patrick Matthäi <pmatthaei at debian.org>  Wed, 24 Jan 2018 09:53:33 +0100
 
diff --git a/debian/patches/04-allow-repository_deletion_without_side_effect.diff b/debian/patches/04-allow-repository_deletion_without_side_effect.diff
deleted file mode 100644
index d02c28b..0000000
--- a/debian/patches/04-allow-repository_deletion_without_side_effect.diff
+++ /dev/null
@@ -1,24 +0,0 @@
-From a3188e301b5a9a1f25dbb98a510e366363348e64 Mon Sep 17 00:00:00 2001
-From: Dan Dennedy <dan at dennedy.org>
-Date: Sun, 19 Feb 2017 12:50:59 -0800
-Subject: [PATCH] Allow Mlt::Repository to be deleted without bad side effect.
-
-mlt_repository_close() is run by mlt_factory_close() when called either
-directly, which requires all Mlt objects to be destroyed prior, or
-atexit().
----
- src/mlt++/MltRepository.cpp | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/src/mlt++/MltRepository.cpp b/src/mlt++/MltRepository.cpp
-index 47a598bc..45522e40 100644
---- a/src/mlt++/MltRepository.cpp
-+++ b/src/mlt++/MltRepository.cpp
-@@ -35,8 +35,6 @@ Repository::Repository( mlt_repository repository ) :
- 
- Repository::~Repository( )
- {
--	if ( instance )
--		mlt_repository_close( instance );
- 	instance = NULL;
- }

-- 
MLT multimedia framework packaging