[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=fd076f1

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

    - Remove merged patch 02-crash-clipinfo-update.
---
 debian/changelog                             |  1 +
 debian/patches/02-crash-clipinfo-update.diff | 19 -------------------
 2 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8f92e09..867d76d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ mlt (6.6.0-1) UNRELEASED; urgency=medium
 
   * New upstream release.
     - Remove merged patch 01-crash-affine.
+    - Remove merged patch 02-crash-clipinfo-update.
 
  -- Patrick Matthäi <pmatthaei at debian.org>  Wed, 24 Jan 2018 09:53:33 +0100
 
diff --git a/debian/patches/02-crash-clipinfo-update.diff b/debian/patches/02-crash-clipinfo-update.diff
deleted file mode 100644
index 3a89684..0000000
--- a/debian/patches/02-crash-clipinfo-update.diff
+++ /dev/null
@@ -1,19 +0,0 @@
-commit bf2749ab998446f13ba20c8cbc33a8c4d1c36963
-Author: Jean-Baptiste Mardelle <jb at kdenlive.org>
-Date:   Sun Feb 5 22:54:50 2017 +0100
-
-    Fix crash in ClipInfo::update method when clip has no resource
-
-diff --git a/src/mlt++/MltPlaylist.cpp b/src/mlt++/MltPlaylist.cpp
-index 5676060..111d3f5 100644
---- a/src/mlt++/MltPlaylist.cpp
-+++ b/src/mlt++/MltPlaylist.cpp
-@@ -71,7 +71,7 @@ void ClipInfo::update( mlt_playlist_clip_info *info )
- 	producer = new Producer( info->producer );
- 	cut = new Producer( info->cut );
- 	start = info->start;
--	resource = strdup( info->resource );
-+	resource = info->resource ? strdup( info->resource ) : 0;
- 	frame_in = info->frame_in;
- 	frame_out = info->frame_out;
- 	frame_count = info->frame_count;

-- 
MLT multimedia framework packaging